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

Commit 79683f80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.15-rc2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fix from Ulf Hansson:
 "sdhci-esdhc-imx: Fixup clock to make i.MX53 Loco (IMX53QSB) boot
  again"

* tag 'mmc-v4.15-rc2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-esdhc-imx: Fix i.MX53 eSDHCv3 clock
parents 02308031 499ed50f

drivers/mmc/host/sdhci-esdhc-imx.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -687,6 +687,20 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
		return;

		return;

	}

	}





	/* For i.MX53 eSDHCv3, SYSCTL.SDCLKFS may not be set to 0. */

	if (is_imx53_esdhc(imx_data)) {

		/*

		 * According to the i.MX53 reference manual, if DLLCTRL[10] can

		 * be set, then the controller is eSDHCv3, else it is eSDHCv2.

		 */

		val = readl(host->ioaddr + ESDHC_DLL_CTRL);

		writel(val | BIT(10), host->ioaddr + ESDHC_DLL_CTRL);

		temp = readl(host->ioaddr + ESDHC_DLL_CTRL);

		writel(val, host->ioaddr + ESDHC_DLL_CTRL);

		if (temp & BIT(10))

			pre_div = 2;

	}



	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);

	temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);

	temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN

	temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN

		| ESDHC_CLOCK_MASK);

		| ESDHC_CLOCK_MASK);