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

Commit e060d376 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: fix WP detection 



Commit "mmc: renesas_sdhi: use MMC_CAP2_NO_WRITE_PROTECT instead of
TMIO own flag" activated MMC_CAP2_NO_WRITE_PROTECT for Renesas SDHI
which incorrectly disabled WP altogether instead of only disabling the
internal mechanism. Since the whole WP handling has been reworked, we
can simply disable this capability to re-enable WP GPIOs.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 97a0c313

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { 
			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

	.bus_shift	= 2,

	.scc_offset	= 0x1000,

	.taps		= rcar_gen3_scc_taps,

drivers/mmc/host/renesas_sdhi_sys_dmac.c

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static const struct renesas_sdhi_of_data of_rz_compatible = { 
static const struct renesas_sdhi_of_data of_rcar_gen1_compatible = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

};



/* Definitions for sampling clocks */
@@ -62,7 +61,6 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = { 
			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

	.dma_buswidth	= DMA_SLAVE_BUSWIDTH_4_BYTES,

	.dma_rx_offset	= 0x2000,

	.scc_offset	= 0x0300,
@@ -83,7 +81,6 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { 
			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

	.bus_shift	= 2,

	.scc_offset	= 0x1000,

	.taps		= rcar_gen3_scc_taps,