Commit 69b07ece authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Chris Ball
Browse files

mmc: omap_hsmmc: Get rid of omap_hsmmc_1_set_power function 



Use omap_hsmmc_235_set_poweri() (now renamed as omap_hsmmc_set_power())
for MMC1 instance as well and get rid of omap_hsmmc_1_set_power()
completely.

omap_hsmmc_235_set_power() seems to be implemented as a superset of
omap_hsmmc_1_set_power() with additional functionality implemented
based on additional checks and hence should just work for MMC1
as well.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Tested-by: default avatarVenkatraman S <svenkatr@ti.com>
Tested-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c2200efb

drivers/mmc/host/omap_hsmmc.c

+3 −27
Original line number Diff line number Diff line
@@ -241,28 +241,7 @@ static int omap_hsmmc_resume_cdirq(struct device *dev, int slot) 


#ifdef CONFIG_REGULATOR



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

				  int vdd)

{

	struct omap_hsmmc_host *host =

		platform_get_drvdata(to_platform_device(dev));

	int ret;



	if (mmc_slot(host).before_set_reg)

		mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);



	if (power_on)

		ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);

	else

		ret = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);



	if (mmc_slot(host).after_set_reg)

		mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);



	return ret;

}



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

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

				   int vdd)

{

	struct omap_hsmmc_host *host =
@@ -332,14 +311,11 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 


	switch (host->id) {

	case OMAP_MMC1_DEVID:

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

		mmc_slot(host).set_power = omap_hsmmc_1_set_power;

		break;

	case OMAP_MMC2_DEVID:

	case OMAP_MMC3_DEVID:

	case OMAP_MMC5_DEVID:

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

		mmc_slot(host).set_power = omap_hsmmc_235_set_power;

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

		mmc_slot(host).set_power = omap_hsmmc_set_power;

		break;

	case OMAP_MMC4_DEVID:

		mmc_slot(host).set_power = omap_hsmmc_4_set_power;

CRA Git | Maintained and supported by SUSTech CRA and CCSE