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

Commit 11d288aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Correct the checks while setting clock scaling frequencies"

parents 14031d35 b3bfaafb

drivers/mmc/core/mmc.c

+4 −4
Original line number Diff line number Diff line
@@ -2056,11 +2056,11 @@ reinit: 
	}



	card->clk_scaling_lowest = host->f_min;

	if ((card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS400) ||

			(card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS200))

	if ((card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400) ||

			(card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200))

		card->clk_scaling_highest = card->ext_csd.hs200_max_dtr;

	else if ((card->mmc_avail_type | EXT_CSD_CARD_TYPE_HS) ||

			(card->mmc_avail_type | EXT_CSD_CARD_TYPE_DDR_52))

	else if ((card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS) ||

			(card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_52))

		card->clk_scaling_highest = card->ext_csd.hs_max_dtr;

	else

		card->clk_scaling_highest = card->csd.max_dtr;

drivers/mmc/host/sdhci-msm.c

+10 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
#define CORE_START_CDC_TRAFFIC		(1 << 6)



#define CORE_PWRSAVE_DLL	(1 << 3)

#define CORE_FIFO_ALT_EN	(1 << 10)

#define CORE_CMDEN_HS400_INPUT_MASK_CNT (1 << 13)



#define CORE_DDR_CAL_EN		(1 << 0)
@@ -4154,7 +4155,7 @@ static void sdhci_set_default_hw_caps(struct sdhci_msm_host *msm_host, 
	 * starts coming.

	 */

	if ((major == 1) && ((minor == 0x42) || (minor == 0x46) ||

				(minor == 0x49)))

				(minor == 0x49) || (minor >= 0x6b)))

		msm_host->use_14lpp_dll = true;



	/* Fake 3.0V support for SDIO devices which requires such voltage */
@@ -4484,6 +4485,14 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	writel_relaxed(CORE_VENDOR_SPEC_POR_VAL,

	host->ioaddr + msm_host_offset->CORE_VENDOR_SPEC);



	/*

	 * Ensure SDHCI FIFO is enabled by disabling alternative FIFO

	 */

	writel_relaxed((readl_relaxed(host->ioaddr +

			msm_host_offset->CORE_VENDOR_SPEC3) &

			~CORE_FIFO_ALT_EN), host->ioaddr +

			msm_host_offset->CORE_VENDOR_SPEC3);



	if (!msm_host->mci_removed) {

		/* Set HC_MODE_EN bit in HC_MODE register */

		writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE));