redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Remove the unnecessary field data_pins from msdc_hw, later this
information should be taken from the device tree.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Lütke-Stetzkamp 2018-04-04 22:15:38 +02:00 committed by Greg Kroah-Hartman
parent eafd4cc4c4
commit c13b45c555
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/mt7621-mmc/board.h
View file

@ -81,7 +81,6 @@ struct msdc_hw {
unsigned char cmd_drv; /* command pad driving */
unsigned char dat_drv; /* data pad driving */
unsigned long flags; /* hardware capability flags */
unsigned long data_pins; /* data pins */
unsigned long data_offset; /* data address offset */
/* config gpio pull mode */

10
drivers/staging/mt7621-mmc/sd.c
View file

@ -192,7 +192,6 @@ struct msdc_hw msdc0_hw = {
.clk_drv = 4,
.cmd_drv = 4,
.dat_drv = 4,
.data_pins = 4,
.data_offset = 0,
.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,
@ -2732,11 +2731,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
For sdio : MSDC_EXT_SDIO_IRQ | MSDC_HIGHSPEED */
if (hw->flags & MSDC_HIGHSPEED)
mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
if (hw->data_pins == 4) { /* current data_pins are all 4*/
mmc->caps |= MMC_CAP_4_BIT_DATA;
} else if (hw->data_pins == 8) {
mmc->caps |= MMC_CAP_8_BIT_DATA;
}
//TODO: read this as bus-width from dt (via mmc_of_parse)
mmc->caps |= MMC_CAP_4_BIT_DATA;
if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */