aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-03-29 17:05:49 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-04-02 21:50:43 -0400
commit3f9efeecb4876661b952746c8bbe460682dce1ad (patch)
treefe7758e3f84eafda2636a3de00bebb9ceaeee827 /arch/arm/mach-shmobile/board-mackerel.c
parentfb7a89c4afa43240af705db44e3e41233016adf9 (diff)
ARM: shmobile: mackerel: remove OCR masks, where regulators are used
Both SDHI and MMCIF drivers ignore their OCR platform values, when available voltages can be retrieved from regulators. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index c4f80d4e4026..734565d4b0f0 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1014,7 +1014,6 @@ static struct platform_device sdhi0_device = {
1014static struct sh_mobile_sdhi_info sdhi1_info = { 1014static struct sh_mobile_sdhi_info sdhi1_info = {
1015 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, 1015 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX,
1016 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, 1016 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX,
1017 .tmio_ocr_mask = MMC_VDD_165_195,
1018 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, 1017 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE,
1019 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 1018 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
1020 MMC_CAP_NEEDS_POLL, 1019 MMC_CAP_NEEDS_POLL,
@@ -1125,7 +1124,6 @@ static struct resource sh_mmcif_resources[] = {
1125 1124
1126static struct sh_mmcif_plat_data sh_mmcif_plat = { 1125static struct sh_mmcif_plat_data sh_mmcif_plat = {
1127 .sup_pclk = 0, 1126 .sup_pclk = 0,
1128 .ocr = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
1129 .caps = MMC_CAP_4_BIT_DATA | 1127 .caps = MMC_CAP_4_BIT_DATA |
1130 MMC_CAP_8_BIT_DATA | 1128 MMC_CAP_8_BIT_DATA |
1131 MMC_CAP_NEEDS_POLL, 1129 MMC_CAP_NEEDS_POLL,