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

Commit 2cf171cb authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

mmc: omap_hsmmc: remove pbias workaround 



remove pbias workaround

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Tested-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 12a71087

drivers/mmc/host/omap_hsmmc.c

+1 −19
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ struct omap_hsmmc_host { 
	struct	regulator	*vcc_aux;

	struct	regulator	*pbias;

	bool			pbias_enabled;

	int			pbias_disable;

	void	__iomem		*base;

	resource_size_t		mapbase;

	spinlock_t		irq_lock; /* Prevent races with irq handler */
@@ -272,13 +271,6 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on, 
	 */

	if (!host->vcc)

		return 0;

	/*

	 * With DT, never turn OFF the regulator for MMC1. This is because

	 * the pbias cell programming support is still missing when

	 * booting with Device tree

	 */

	if (host->pbias_disable && !vdd)

		return 0;



	if (mmc_slot(host).before_set_reg)

		mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
@@ -1543,13 +1535,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		 * of external transceiver; but they all handle 1.8V.

		 */

		if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) &&

			(ios->vdd == DUAL_VOLT_OCR_BIT) &&

			/*

			 * With pbias cell programming missing, this

			 * can't be allowed on MMC1 when booting with device

			 * tree.

			 */

			!host->pbias_disable) {

			(ios->vdd == DUAL_VOLT_OCR_BIT)) {

				/*

				 * The mmc_select_voltage fn of the core does

				 * not seem to set the power_mode to
@@ -1901,10 +1887,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 


	omap_hsmmc_context_save(host);



	/* This can be removed once we support PBIAS with DT */

	if (host->dev->of_node && res->start == 0x4809c000)

		host->pbias_disable = 1;



	host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");

	/*

	 * MMC can still work without debounce clock.