omap_hsmmc: implement driver check for card detection

Implement driver check for card detection.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Nikita Kiryanov 2012-12-03 02:19:44 +00:00 committed by Tom Rini
parent cc22b0c012
commit e874d5b001
28 changed files with 69 additions and 49 deletions

View File

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

View File

@ -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);
omap_mmc_init(0, 0, 0, -1);
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
omap_mmc_init(1, 0, 0);
omap_mmc_init(1, 0, 0, -1);
break;
}
return 0;

View File

@ -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);
omap_mmc_init(0, 0, 0, -1);
break;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
omap_mmc_init(1, 0, 0);
omap_mmc_init(1, 0, 0, -1);
break;
}
return 0;

View File

@ -161,7 +161,7 @@ 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 omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio);
#endif /* OMAP_MMC_H_ */

View File

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

View File

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

View File

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

View File

@ -114,7 +114,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0);
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -392,7 +392,6 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0);
return 0;
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

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

View File

@ -147,7 +147,7 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0);
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

@ -304,7 +304,7 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0);
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

@ -78,7 +78,6 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0);
return 0;
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

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

View File

@ -277,7 +277,6 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0);
return 0;
return omap_mmc_init(0, 0, 0, -1);
}
#endif

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -30,6 +30,7 @@
#include <twl4030.h>
#include <twl6030.h>
#include <twl6035.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sys_proto.h>
@ -40,6 +41,7 @@
struct omap_hsmmc_data {
struct hsmmc *base_addr;
int cd_gpio;
};
/* If we fail after 1 second wait, something is really bad */
@ -51,6 +53,36 @@ static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
static struct mmc hsmmc_dev[3];
static struct omap_hsmmc_data hsmmc_dev_data[3];
#if (defined(CONFIG_OMAP_GPIO) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_GPIO_SUPPORT))
static int omap_mmc_setup_gpio_in(int gpio, const char *label)
{
if (!gpio_is_valid(gpio))
return -1;
if (gpio_request(gpio, label) < 0)
return -1;
if (gpio_direction_input(gpio) < 0)
return -1;
return gpio;
}
static int omap_mmc_getcd(struct mmc *mmc)
{
int cd_gpio = ((struct omap_hsmmc_data *)mmc->priv)->cd_gpio;
return gpio_get_value(cd_gpio);
}
#else
static inline int omap_mmc_setup_gpio_in(int gpio, const char *label)
{
return -1;
}
#define omap_mmc_getcd NULL
#endif
#if defined(CONFIG_OMAP44XX) && defined(CONFIG_TWL6030_POWER)
static void omap4_vmmc_pbias_config(struct mmc *mmc)
{
@ -548,7 +580,7 @@ static void mmc_set_ios(struct mmc *mmc)
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 omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio)
{
struct mmc *mmc = &hsmmc_dev[dev_index];
struct omap_hsmmc_data *priv_data = &hsmmc_dev_data[dev_index];
@ -557,7 +589,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max)
mmc->send_cmd = mmc_send_cmd;
mmc->set_ios = mmc_set_ios;
mmc->init = mmc_init_setup;
mmc->getcd = NULL;
mmc->getcd = omap_mmc_getcd;
mmc->priv = priv_data;
switch (dev_index) {
@ -578,6 +610,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max)
priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
return 1;
}
priv_data->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
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_MODE_HC) & ~host_caps_mask;