Merge "mmc: host: Reorder MMC_SDHCI_MSM_ICE config" (c7280cb8) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/host/Kconfig

+11 −11

Original line number	Diff line number	Diff line
		@@ -127,17 +127,6 @@ config MMC_SDHCI_OF_ARASAN

		If unsure, say N.

		config MMC_SDHCI_MSM_ICE
		bool "Qualcomm Technologies, Inc Inline Crypto Engine for SDHCI core"
		depends on MMC_SDHCI_MSM && CRYPTO_DEV_QCOM_ICE
		help
		This selects the QTI specific additions to support Inline Crypto
		Engine (ICE). ICE accelerates the crypto operations and maintains
		the high SDHCI performance.

		Select this if you have ICE supported for SDHCI on QTI chipset.
		If unsure, say N.

		config MMC_SDHCI_OF_ESDHC
		tristate "SDHCI OF support for the Freescale eSDHC controller"
		depends on MMC_SDHCI_PLTFM
		@@ -389,6 +378,17 @@ config MMC_SDHCI_MSM

		If unsure, say N.

		config MMC_SDHCI_MSM_ICE
		bool "Qualcomm Technologies, Inc Inline Crypto Engine for SDHCI core"
		depends on MMC_SDHCI_MSM && CRYPTO_DEV_QCOM_ICE
		help
		This selects the QTI specific additions to support Inline Crypto
		Engine (ICE). ICE accelerates the crypto operations and maintains
		the high SDHCI performance.

		Select this if you have ICE supported for SDHCI on QTI chipset.
		If unsure, say N.

		config MMC_MSM
		tristate "Qualcomm SDCC Controller Support"
		depends on MMC && (ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50)

+2 −2

Original line number	Diff line number	Diff line
		@@ -2918,7 +2918,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
		*/
		dev_err(&pdev->dev, "%s: required ICE device not probed yet err = %d\n",
		__func__, ret);
		goto out_host_free;
		goto pltfm_free;

		} else if (ret == -ENODEV) {
		/*
		@@ -2930,7 +2930,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
		} else if (ret) {
		dev_err(&pdev->dev, "%s: sdhci_msm_ice_get_dev failed %d\n",
		__func__, ret);
		goto out_host_free;
		goto pltfm_free;
		}

		/* Extract platform data */