Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e7e170 authored by stanley.miao's avatar stanley.miao Committed by Tony Lindgren
Browse files

omap: hsmmc: fix the hsmmc driver for am3517 



AM3517 don't have the register OMAP343X_CONTROL_PBIAS_LITE and the regulators
like "vmmc", so we set a noop "set_power" function for it.

Signed-off-by: default avatarStanley.Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ed8303fc

arch/arm/mach-omap2/hsmmc.c

+21 −6
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot, 
	}

}



static int nop_mmc_set_power(struct device *dev, int slot, int power_on,

							int vdd)

{

	return 0;

}



static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;



void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
@@ -216,11 +222,18 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) 
		 */

		mmc->slots[0].ocr_mask = c->ocr_mask;



		if (cpu_is_omap3517() || cpu_is_omap3505())

			mmc->slots[0].set_power = nop_mmc_set_power;

		else

			mmc->slots[0].features |= HSMMC_HAS_PBIAS;



		switch (c->mmc) {

		case 1:

			if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {

				/* on-chip level shifting via PBIAS0/PBIAS1 */

				mmc->slots[0].before_set_reg = hsmmc1_before_set_reg;

				mmc->slots[0].after_set_reg = hsmmc1_after_set_reg;

			}



			/* Omap3630 HSMMC1 supports only 4-bit */

			if (cpu_is_omap3630() && c->wires > 4) {
@@ -235,9 +248,11 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) 
				c->wires = 4;

			/* FALLTHROUGH */

		case 3:

			if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {

				/* off-chip level shifting, or none */

				mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;

				mmc->slots[0].after_set_reg = NULL;

			}

			break;

		default:

			pr_err("MMC%d configuration not supported!\n", c->mmc);

arch/arm/plat-omap/include/plat/mmc.h

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ struct omap_mmc_platform_data { 
		/* Regulator off remapped to sleep */

		unsigned vcc_aux_disable_is_sleep:1;



		/* we can put the features above into this variable */

#define HSMMC_HAS_PBIAS		(1 << 0)

		unsigned features;



		int switch_pin;			/* gpio (card detect) */

		int gpio_wp;			/* gpio (write protect) */