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

Commit 273c5414 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

mmc: sdhci: put together into one condition checking 



value of ios->timing is not related with SDCHI v3.0.  If Controller version
is v3.0, SDHCI_QUIRK_NO_HISPD_BIT is meaningless.  To prevent the setting
wrong bit moves into one condition checking.  (e.g sdhci-s3c doesn't use
SDHCI_CTRL_HISPD bit, instead using this bit as other purpose.)

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e5517c2a

drivers/mmc/host/sdhci.c

+8 −11
Original line number Diff line number Diff line
@@ -1623,7 +1623,14 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);



	if ((ios->timing == MMC_TIMING_SD_HS ||

	     ios->timing == MMC_TIMING_MMC_HS)

	     ios->timing == MMC_TIMING_MMC_HS ||

	     ios->timing == MMC_TIMING_MMC_HS400 ||

	     ios->timing == MMC_TIMING_MMC_HS200 ||

	     ios->timing == MMC_TIMING_MMC_DDR52 ||

	     ios->timing == MMC_TIMING_UHS_SDR50 ||

	     ios->timing == MMC_TIMING_UHS_SDR104 ||

	     ios->timing == MMC_TIMING_UHS_DDR50 ||

	     ios->timing == MMC_TIMING_UHS_SDR25)

	    && !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT))

		ctrl |= SDHCI_CTRL_HISPD;

	else
@@ -1632,16 +1639,6 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	if (host->version >= SDHCI_SPEC_300) {

		u16 clk, ctrl_2;



		/* In case of UHS-I modes, set High Speed Enable */

		if ((ios->timing == MMC_TIMING_MMC_HS400) ||

		    (ios->timing == MMC_TIMING_MMC_HS200) ||

		    (ios->timing == MMC_TIMING_MMC_DDR52) ||

		    (ios->timing == MMC_TIMING_UHS_SDR50) ||

		    (ios->timing == MMC_TIMING_UHS_SDR104) ||

		    (ios->timing == MMC_TIMING_UHS_DDR50) ||

		    (ios->timing == MMC_TIMING_UHS_SDR25))

			ctrl |= SDHCI_CTRL_HISPD;



		if (!host->preset_enabled) {

			sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

			/*