From 2e6f73bd555e72edb316d52d73e8371792df3adf Mon Sep 17 00:00:00 2001 From: Ram Prakash Gupta Date: Tue, 11 Sep 2018 20:44:59 +0530 Subject: [PATCH 1/2] mmc: host: sdhci-msm-ice: Fix compilation issue in ice Fix compilation issue in kernel 4.14, for err message as "logical not is only applied to the left hand side of this bitwise operator". To fix this issue, used paranthesis for left hand side of bitwise operator. Change-Id: If556455149c2c7de2b87d6abcbbc483131606fbf Signed-off-by: Ram Prakash Gupta --- drivers/mmc/host/sdhci-msm-ice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm-ice.c b/drivers/mmc/host/sdhci-msm-ice.c index daa39c8eacd6..aa4c0f94559c 100644 --- a/drivers/mmc/host/sdhci-msm-ice.c +++ b/drivers/mmc/host/sdhci-msm-ice.c @@ -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 & From 50b418239ee672179a96e0c30eca4e43a0fa5264 Mon Sep 17 00:00:00 2001 From: Ram Prakash Gupta Date: Thu, 13 Sep 2018 13:45:37 +0530 Subject: [PATCH 2/2] ARM: configs: Enable ICE support for emmc on sm6150 Enable ICE support for emmc on sm6150. Change-Id: Ifc93304aa40a9a63d77b12d8cb5e185c36cc6b30 Signed-off-by: Ram Prakash Gupta --- arch/arm64/configs/vendor/sdmsteppe-perf_defconfig | 1 + arch/arm64/configs/vendor/sdmsteppe_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/sdmsteppe-perf_defconfig b/arch/arm64/configs/vendor/sdmsteppe-perf_defconfig index db35d6552702..858c15a40a1e 100644 --- a/arch/arm64/configs/vendor/sdmsteppe-perf_defconfig +++ b/arch/arm64/configs/vendor/sdmsteppe-perf_defconfig @@ -442,6 +442,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 diff --git a/arch/arm64/configs/vendor/sdmsteppe_defconfig b/arch/arm64/configs/vendor/sdmsteppe_defconfig index 903f985680f5..ac371dccfc7c 100644 --- a/arch/arm64/configs/vendor/sdmsteppe_defconfig +++ b/arch/arm64/configs/vendor/sdmsteppe_defconfig @@ -455,6 +455,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