diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2012-12-03 02:19:47 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-08 16:41:13 -0500 |
| commit | e3913f56a26dbb49758370320dac477ab0324631 (patch) | |
| tree | b2a989a6483ef53c309b0e16f774b8d2007c9bfd /arch | |
| parent | d23d8d7e069c3aca071b7f68d9c15d11f8d4c84d (diff) | |
| download | blackbird-obmc-uboot-e3913f56a26dbb49758370320dac477ab0324631.tar.gz blackbird-obmc-uboot-e3913f56a26dbb49758370320dac477ab0324631.zip | |
omap_hsmmc: add driver check for write protection
Add check for write protection in omap mmc driver.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/omap_mmc.h | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 7def17ebac..e35a3e3a70 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -56,11 +56,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 793e82e95c..24cbe2da05 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -64,11 +64,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 f9f7aae776..23ccc59385 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 8d86de1b11..617e22fa52 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_ */ |
