diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-05-23 09:13:46 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-27 08:06:50 -0400 |
commit | 4fa0614f40bfe8434d843da82664a6da06915bc1 (patch) | |
tree | 1d0695cc29c60e49825f9bc9b1fa56984a06a7ca /arch/arm/mach-ux500/board-mop500-sdi.c | |
parent | b6ff56a4acdc16c626f713bbad0528984234e550 (diff) |
ARM: ux500: Don't set plf ocr mask for SD/MMC device
The mmci host driver overrides platform ocr mask when a vmmc regulator
can be used. This is the case for sdi0(SD-card) and for sdi4(eMMC).
Thus it is pointless of specifing these mask and why we do remove them.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-sdi.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index eb9b2deac78a..c0573d2c0a51 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c | |||
@@ -52,7 +52,6 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = { | |||
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | struct mmci_platform_data mop500_sdi0_data = { | 54 | struct mmci_platform_data mop500_sdi0_data = { |
55 | .ocr_mask = MMC_VDD_29_30, | ||
56 | .f_max = 100000000, | 55 | .f_max = 100000000, |
57 | .capabilities = MMC_CAP_4_BIT_DATA | | 56 | .capabilities = MMC_CAP_4_BIT_DATA | |
58 | MMC_CAP_SD_HIGHSPEED | | 57 | MMC_CAP_SD_HIGHSPEED | |
@@ -180,7 +179,6 @@ static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = { | |||
180 | #endif | 179 | #endif |
181 | 180 | ||
182 | struct mmci_platform_data mop500_sdi4_data = { | 181 | struct mmci_platform_data mop500_sdi4_data = { |
183 | .ocr_mask = MMC_VDD_29_30, | ||
184 | .f_max = 100000000, | 182 | .f_max = 100000000, |
185 | .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | | 183 | .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | |
186 | MMC_CAP_MMC_HIGHSPEED, | 184 | MMC_CAP_MMC_HIGHSPEED, |