Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9efeec authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Simon Horman
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent fb7a89c4

arch/arm/mach-shmobile/board-mackerel.c

+0 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ static struct platform_device sdhi0_device = { 
static struct sh_mobile_sdhi_info sdhi1_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.tmio_ocr_mask	= MMC_VDD_165_195,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_NEEDS_POLL,
@@ -1125,7 +1124,6 @@ static struct resource sh_mmcif_resources[] = { 


static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.caps		= MMC_CAP_4_BIT_DATA |

			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,