Add check for write protection in omap mmc driver.
Signed-off-by: Nikita Kiryanov nik...@compulab.co.il
Signed-off-by: Igor Grinberg grinb...@compulab.co.il
---
arch/arm/cpu/armv7/am33xx/board.c|4 ++--
arch/arm/cpu/armv7/omap-common/boot-common.c |4 ++--
arch/arm/cpu/armv7/omap3/board.c |4 ++--
arch/arm/include/asm/omap_mmc.h |3 ++-
board/cm_t35/cm_t35.c|2 +-
board/comelit/dig297/dig297.c|2 +-
board/corscience/tricorder/tricorder.c |2 +-
board/htkw/mcx/mcx.c |2 +-
board/isee/igep0020/igep0020.c |2 +-
board/isee/igep0030/igep0030.c |2 +-
board/logicpd/am3517evm/am3517evm.c |2 +-
board/logicpd/omap3som/omap3logic.c |2 +-
board/logicpd/zoom1/zoom1.c |2 +-
board/logicpd/zoom2/zoom2.c |2 +-
board/matrix_vision/mvblx/mvblx.c|4 ++--
board/nokia/rx51/rx51.c |4 ++--
board/overo/overo.c |2 +-
board/pandora/pandora.c |2 +-
board/technexion/twister/twister.c |2 +-
board/teejet/mt_ventoux/mt_ventoux.c |2 +-
board/ti/am3517crane/am3517crane.c |2 +-
board/ti/beagle/beagle.c |2 +-
board/ti/evm/evm.c |2 +-
board/ti/omap5_evm/evm.c |4 ++--
board/ti/panda/panda.c |2 +-
board/ti/sdp3430/sdp.c |2 +-
board/ti/sdp4430/sdp.c |4 ++--
board/timll/devkit8000/devkit8000.c |2 +-
drivers/mmc/omap_hsmmc.c | 14 --
29 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/arch/arm/cpu/armv7/am33xx/board.c
b/arch/arm/cpu/armv7/am33xx/board.c
index 928ff9f..99325c4 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -50,11 +50,11 @@ int cpu_mmc_init(bd_t *bis)
{
int ret;
- ret = omap_mmc_init(0, 0, 0, -1);
+ ret = omap_mmc_init(0, 0, 0, -1, -1);
if (ret)
return ret;
- return omap_mmc_init(1, 0, 0, -1);
+ return omap_mmc_init(1, 0, 0, -1, -1);
}
#endif
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c
b/arch/arm/cpu/armv7/omap-common/boot-common.c
index dc2ee0d..25253b6 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -60,11 +60,11 @@ int board_mmc_init(bd_t *bis)
{
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
- omap_mmc_init(0, 0, 0, -1);
+ omap_mmc_init(0, 0, 0, -1, -1);
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
- omap_mmc_init(1, 0, 0, -1);
+ omap_mmc_init(1, 0, 0, -1, -1);
break;
}
return 0;
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index e95cc50..84e3bcb 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -98,11 +98,11 @@ int board_mmc_init(bd_t *bis)
{
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
- omap_mmc_init(0, 0, 0, -1);
+ omap_mmc_init(0, 0, 0, -1, -1);
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
- omap_mmc_init(1, 0, 0, -1);
+ omap_mmc_init(1, 0, 0, -1, -1);
break;
}
return 0;
diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 8d86de1..617e22f 100644
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -161,7 +161,8 @@ struct hsmmc {
#define mmc_reg_out(addr, mask, val)\
writel((readl(addr) (~(mask))) | ((val) (mask)), (addr))
-int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio);
+int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
+ int wp_gpio);
#endif /* OMAP_MMC_H_ */
diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 50c0990..6b3617c 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -357,7 +357,7 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis)
{
- return omap_mmc_init(0, 0, 0, -1);
+ return omap_mmc_init(0, 0, 0, -1, 59);
}
#endif
diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c
index 2a55cb8..2dca275 100644
--- a/board/comelit/dig297/dig297.c
+++ b/board/comelit/dig297/dig297.c
@@ -147,7 +147,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis)
{
- return omap_mmc_init(0, 0, 0, -1);
+ return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
diff --git
