Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

omap_hsmmc: add driver check for write protection

Browse source 
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>
This commit is contained in:
Nikita Kiryanov 2012-12-03 02:19:47 +00:00 committed by Tom Rini
parent d23d8d7e06
commit e3913f56a2
28 changed files with 47 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/cpu/armv7/am33xx/board.c
View file

@ -56,11 +56,11 @@ int cpu_mmc_init(bd_t *bis)
{ {
int ret; int ret;
ret = omap_mmc_init(0, 0, 0, -1); ret = omap_mmc_init(0, 0, 0, -1, -1);
if (ret) if (ret)
return ret; return ret;
return omap_mmc_init(1, 0, 0, -1); return omap_mmc_init(1, 0, 0, -1, -1);
} }
#endif #endif

4
arch/arm/cpu/armv7/omap-common/boot-common.c
View file

@ -64,11 +64,11 @@ int board_mmc_init(bd_t *bis)
{ {
switch (spl_boot_device()) { switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
break; break;
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2: case BOOT_DEVICE_MMC2_2:
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
break; break;
} }
return 0; return 0;

4
arch/arm/cpu/armv7/omap3/board.c
View file

@ -98,11 +98,11 @@ int board_mmc_init(bd_t *bis)
{ {
switch (spl_boot_device()) { switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
break; break;
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2: case BOOT_DEVICE_MMC2_2:
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
break; break;
} }
return 0; return 0;

3
arch/arm/include/asm/omap_mmc.h
View file

@ -161,7 +161,8 @@ struct hsmmc {
#define mmc_reg_out(addr, mask, val)\ #define mmc_reg_out(addr, mask, val)\
writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) 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_ */ #endif /* OMAP_MMC_H_ */

2
board/cm_t35/cm_t35.c
View file

@ -390,7 +390,7 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/comelit/dig297/dig297.c
View file

@ -147,7 +147,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) 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 #endif

2
board/corscience/tricorder/tricorder.c
View file

@ -80,7 +80,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !(defined(CONFIG_SPL_BUILD)) #if defined(CONFIG_GENERIC_MMC) && !(defined(CONFIG_SPL_BUILD))
int board_mmc_init(bd_t *bis) 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 #endif

2
board/htkw/mcx/mcx.c
View file

@ -114,7 +114,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/isee/igep00x0/igep00x0.c
View file

@ -150,7 +150,7 @@ static inline void setup_net_chip(void) {}
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/logicpd/am3517evm/am3517evm.c
View file

@ -135,7 +135,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/logicpd/omap3som/omap3logic.c
View file

@ -140,7 +140,7 @@ int board_init(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/logicpd/zoom1/zoom1.c
View file

@ -92,7 +92,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) 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 #endif

2
board/logicpd/zoom2/zoom2.c
View file

@ -183,7 +183,7 @@ void set_muxconf_regs (void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) 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 #endif

4
board/matrix_vision/mvblx/mvblx.c
View file

@ -106,8 +106,8 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
return 0; return 0;
} }
#endif #endif

4
board/nokia/rx51/rx51.c
View file

@ -671,7 +671,7 @@ int rx51_kp_getc(void)
*/ */
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
return 0; return 0;
} }

2
board/overo/overo.c
View file

@ -392,6 +392,6 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/pandora/pandora.c
View file

@ -139,6 +139,6 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) 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 #endif

2
board/technexion/twister/twister.c
View file

@ -147,7 +147,7 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD) !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/teejet/mt_ventoux/mt_ventoux.c
View file

@ -304,7 +304,7 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD) !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/ti/am3517crane/am3517crane.c
View file

@ -78,6 +78,6 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/ti/beagle/beagle.c
View file

@ -532,7 +532,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/ti/evm/evm.c
View file

@ -277,6 +277,6 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

4
board/ti/omap5_evm/evm.c
View file

@ -94,8 +94,8 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
return 0; return 0;
} }
#endif #endif

2
board/ti/panda/panda.c
View file

@ -179,7 +179,7 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) 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 #endif

2
board/ti/sdp3430/sdp.c
View file

@ -209,6 +209,6 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) 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 #endif

4
board/ti/sdp4430/sdp.c
View file

@ -108,8 +108,8 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1); omap_mmc_init(0, 0, 0, -1, -1);
omap_mmc_init(1, 0, 0, -1); omap_mmc_init(1, 0, 0, -1, -1);
return 0; return 0;
} }
#endif #endif

2
board/timll/devkit8000/devkit8000.c
View file

@ -136,7 +136,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) 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 #endif

14
drivers/mmc/omap_hsmmc.c
View file

@ -42,6 +42,7 @@
struct omap_hsmmc_data { struct omap_hsmmc_data {
struct hsmmc *base_addr; struct hsmmc *base_addr;
int cd_gpio; int cd_gpio;
int wp_gpio;
}; };
/* If we fail after 1 second wait, something is really bad */ /* If we fail after 1 second wait, something is really bad */
@ -74,6 +75,12 @@ static int omap_mmc_getcd(struct mmc *mmc)
int cd_gpio = ((struct omap_hsmmc_data *)mmc->priv)->cd_gpio; int cd_gpio = ((struct omap_hsmmc_data *)mmc->priv)->cd_gpio;
return gpio_get_value(cd_gpio); return gpio_get_value(cd_gpio);
} }
static int omap_mmc_getwp(struct mmc *mmc)
{
int wp_gpio = ((struct omap_hsmmc_data *)mmc->priv)->wp_gpio;
return gpio_get_value(wp_gpio);
}
#else #else
static inline int omap_mmc_setup_gpio_in(int gpio, const char *label) static inline int omap_mmc_setup_gpio_in(int gpio, const char *label)
{ {
@ -81,6 +88,7 @@ static inline int omap_mmc_setup_gpio_in(int gpio, const char *label)
} }
#define omap_mmc_getcd NULL #define omap_mmc_getcd NULL
#define omap_mmc_getwp NULL
#endif #endif
#if defined(CONFIG_OMAP44XX) && defined(CONFIG_TWL6030_POWER) #if defined(CONFIG_OMAP44XX) && defined(CONFIG_TWL6030_POWER)
@ -580,7 +588,8 @@ static void mmc_set_ios(struct mmc *mmc)
writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl); writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl);
} }
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)
{ {
struct mmc *mmc = &hsmmc_dev[dev_index]; struct mmc *mmc = &hsmmc_dev[dev_index];
struct omap_hsmmc_data *priv_data = &hsmmc_dev_data[dev_index]; struct omap_hsmmc_data *priv_data = &hsmmc_dev_data[dev_index];
@ -590,7 +599,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio)
mmc->set_ios = mmc_set_ios; mmc->set_ios = mmc_set_ios;
mmc->init = mmc_init_setup; mmc->init = mmc_init_setup;
mmc->getcd = omap_mmc_getcd; mmc->getcd = omap_mmc_getcd;
mmc->getwp = NULL; mmc->getwp = omap_mmc_getwp;
mmc->priv = priv_data; mmc->priv = priv_data;
switch (dev_index) { switch (dev_index) {
@ -612,6 +621,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio)
return 1; return 1;
} }
priv_data->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd"); priv_data->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
priv_data->wp_gpio = omap_mmc_setup_gpio_in(wp_gpio, "mmc_wp");
mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
mmc->host_caps = (MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS | mmc->host_caps = (MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS |
MMC_MODE_HC) & ~host_caps_mask; MMC_MODE_HC) & ~host_caps_mask;