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

Commit f195cd00 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: configs: Enable ICE support for emmc on sm6150"

parents 8b1ce34a 50b41823

arch/arm64/configs/vendor/sdmsteppe-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ CONFIG_MMC_CLKGATE=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

arch/arm64/configs/vendor/sdmsteppe_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ CONFIG_MMC_CLKGATE=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

drivers/mmc/host/sdhci-msm-ice.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void sdhci_msm_ice_hci_update_noncq_cfg(struct sdhci_host *host, 
	 */

	/* Configure ICE bypass mode */

	crypto_params |=

		(!bypass & MASK_SDHCI_MSM_ICE_HCI_PARAM_CE)

		((!bypass) & MASK_SDHCI_MSM_ICE_HCI_PARAM_CE)

			<< OFFSET_SDHCI_MSM_ICE_HCI_PARAM_CE;

	/* Configure Crypto Configure Index (CCI) */

	crypto_params |= (key_index &