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

dm: sunxi: Request card detect gpio

Browse source 
This is necessary for the device-model enabled builds to work properly.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2014-10-31 16:55:02 +01:00
parent 1a81cf8399
commit 967325feb2
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/mmc/sunxi_mmc.c
View file

@ -30,10 +30,22 @@ struct sunxi_mmc_host {
/* support 4 mmc hosts */ /* support 4 mmc hosts */
struct sunxi_mmc_host mmc_host[4]; struct sunxi_mmc_host mmc_host[4];
static int sunxi_mmc_getcd_gpio(int sdc_no)
{
switch (sdc_no) {
case 0: return sunxi_name_to_gpio(CONFIG_MMC0_CD_PIN);
case 1: return sunxi_name_to_gpio(CONFIG_MMC1_CD_PIN);
case 2: return sunxi_name_to_gpio(CONFIG_MMC2_CD_PIN);
case 3: return sunxi_name_to_gpio(CONFIG_MMC3_CD_PIN);
}
return -1;
}
static int mmc_resource_init(int sdc_no) static int mmc_resource_init(int sdc_no)
{ {
struct sunxi_mmc_host *mmchost = &mmc_host[sdc_no]; struct sunxi_mmc_host *mmchost = &mmc_host[sdc_no];
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
int cd_pin, ret = 0;
debug("init mmc %d resource\n", sdc_no); debug("init mmc %d resource\n", sdc_no);
@ -60,7 +72,11 @@ static int mmc_resource_init(int sdc_no)
} }
mmchost->mmc_no = sdc_no; mmchost->mmc_no = sdc_no;
return 0; cd_pin = sunxi_mmc_getcd_gpio(sdc_no);
if (cd_pin != -1)
ret = gpio_request(cd_pin, "mmc_cd");
return ret;
} }
static int mmc_clk_io_on(int sdc_no) static int mmc_clk_io_on(int sdc_no)
@ -351,15 +367,9 @@ out:
static int sunxi_mmc_getcd(struct mmc *mmc) static int sunxi_mmc_getcd(struct mmc *mmc)
{ {
struct sunxi_mmc_host *mmchost = mmc->priv; struct sunxi_mmc_host *mmchost = mmc->priv;
int cd_pin = -1; int cd_pin;
switch (mmchost->mmc_no) {
case 0: cd_pin = sunxi_name_to_gpio(CONFIG_MMC0_CD_PIN); break;
case 1: cd_pin = sunxi_name_to_gpio(CONFIG_MMC1_CD_PIN); break;
case 2: cd_pin = sunxi_name_to_gpio(CONFIG_MMC2_CD_PIN); break;
case 3: cd_pin = sunxi_name_to_gpio(CONFIG_MMC3_CD_PIN); break;
}
cd_pin = sunxi_mmc_getcd_gpio(mmchost->mmc_no);
if (cd_pin == -1) if (cd_pin == -1)
return 1; return 1;
@ -393,7 +403,9 @@ struct mmc *sunxi_mmc_init(int sdc_no)
cfg->f_min = 400000; cfg->f_min = 400000;
cfg->f_max = 52000000; cfg->f_max = 52000000;
mmc_resource_init(sdc_no); if (mmc_resource_init(sdc_no) != 0)
return NULL;
mmc_clk_io_on(sdc_no); mmc_clk_io_on(sdc_no);
return mmc_create(cfg, &mmc_host[sdc_no]); return mmc_create(cfg, &mmc_host[sdc_no]);