Commit c13b45c5 authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman

staging: mt7621-mmc: Remove unnecessary field from struct msdc_hw

Remove the unnecessary field data_pins from msdc_hw, later this
information should be taken from the device tree.
Signed-off-by: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eafd4cc4
...@@ -81,7 +81,6 @@ struct msdc_hw { ...@@ -81,7 +81,6 @@ struct msdc_hw {
unsigned char cmd_drv; /* command pad driving */ unsigned char cmd_drv; /* command pad driving */
unsigned char dat_drv; /* data pad driving */ unsigned char dat_drv; /* data pad driving */
unsigned long flags; /* hardware capability flags */ unsigned long flags; /* hardware capability flags */
unsigned long data_pins; /* data pins */
unsigned long data_offset; /* data address offset */ unsigned long data_offset; /* data address offset */
/* config gpio pull mode */ /* config gpio pull mode */
......
...@@ -192,7 +192,6 @@ struct msdc_hw msdc0_hw = { ...@@ -192,7 +192,6 @@ struct msdc_hw msdc0_hw = {
.clk_drv = 4, .clk_drv = 4,
.cmd_drv = 4, .cmd_drv = 4,
.dat_drv = 4, .dat_drv = 4,
.data_pins = 4,
.data_offset = 0, .data_offset = 0,
.flags = MSDC_SYS_SUSPEND | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED, .flags = MSDC_SYS_SUSPEND | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
// .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE, // .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
...@@ -2732,11 +2731,10 @@ static int msdc_drv_probe(struct platform_device *pdev) ...@@ -2732,11 +2731,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
For sdio : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */ For sdio : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */
if (hw->flags & MSDC_HIGHSPEED) if (hw->flags & MSDC_HIGHSPEED)
mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED; mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
if (hw->data_pins == 4) { /* current data_pins are all 4*/
//TODO: read this as bus-width from dt (via mmc_of_parse)
mmc->caps |= MMC_CAP_4_BIT_DATA; mmc->caps |= MMC_CAP_4_BIT_DATA;
} else if (hw->data_pins == 8) {
mmc->caps |= MMC_CAP_8_BIT_DATA;
}
if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ)) if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */ mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment