Skip to contentSkip to conversation

mmc: Move FSL_ESDHC under if MMC

PATCH New Trent Piepho 3 participants 4 messages Apr 1, 2019 – May 23, 2019 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: Move FSL_ESDHC under if MMC

The fsl esdhc driver was the only mmc driver that could be enabled if mmc support was off. It does not appear to compile in such a configuration.

Move it to be inside the "if" that makes it conditional on MMC support.

It's still possible to turn off DM_MMC and enable the driver.

It looks like a rebase mistake in the original commit that added it, as it would behaved as expected if just moved up a bit in the file.

Cc Peng Fan <[email protected]>
Cc Mario Six <[email protected]>
Cc Jaehoon Chung <[email protected]>
---
 drivers/mmc/Kconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mmc/Kconfig +6 -6
index 496b2cba64..08c2dd2541 100644
@@ -619,6 +619,12 @@ config MMC_MTK
 	  This is needed if support for any SD/SDIO/MMC devices is required.
 	  If unsure, say N.
 
+config FSL_ESDHC
+	bool "Freescale/NXP eSDHC controller support"
+	help
+	  This selects support for the eSDHC (enhanced secure digital host
+	  controller) found on numerous Freescale/NXP SoCs.
+
 endif
 
 config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
@@ -632,12 +638,6 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
 	  TODO(marcel.ziswiler at toradex.com): Move to device tree controlled
 	  approach once proper kernel integration made it mainline.
 
-config FSL_ESDHC
-	bool "Freescale/NXP eSDHC controller support"
-	help
-	  This selects support for the eSDHC (enhanced secure digital host
-	  controller) found on numerous Freescale/NXP SoCs.
-
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111
Signature · 1 line
2.14.5
#1 lore raw

PATCH 1/1 mmc: Move tegra loopback disable option to be under tegra

This is a configuration option specific to the tegra controller.

Doing it this way makes it show up directly under the tegra controller option, indented one level, as "Disable external clock loopback".

The way it is now, it shows up at the end of the controller list, not indented, as if it's some kind of generic MMC configuration option.

Cc Marcel Ziswiler <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jaehoon Chung <[email protected]>
Cc Tom Warren <[email protected]>
---
 drivers/mmc/Kconfig | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/mmc/Kconfig +11 -11
index 08c2dd2541..759a1cceb4 100644
@@ -542,6 +542,17 @@ config MMC_SDHCI_TEGRA
 
 	  If unsure, say N.
 
+config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
+	bool "Disable external clock loopback"
+	depends on MMC_SDHCI_TEGRA && TEGRA124
+	help
+	  Disable the external clock loopback and use the internal one on SDMMC3
+	  as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits
+	  being set to 0xfffd according to the TRM.
+
+	  TODO(marcel.ziswiler at toradex.com): Move to device tree controlled
+	  approach once proper kernel integration made it mainline.
+
 config MMC_SDHCI_ZYNQ
 	bool "Arasan SDHCI controller support"
 	depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
@@ -627,17 +638,6 @@ config FSL_ESDHC
 
 endif
 
-config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
-	bool "Disable external clock loopback"
-	depends on MMC_SDHCI_TEGRA && TEGRA124
-	help
-	  Disable the external clock loopback and use the internal one on SDMMC3
-	  as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits
-	  being set to 0xfffd according to the TRM.
-
-	  TODO(marcel.ziswiler at toradex.com): Move to device tree controlled
-	  approach once proper kernel integration made it mainline.
-
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111
Signature · 1 line
2.14.5
#2 lore raw

PATCH 1/1 mmc: Move tegra loopback disable option to be under tegra

Quoted 9 lines · Trent Piepho

This is a configuration option specific to the tegra controller.

Doing it this way makes it show up directly under the tegra controller option, indented one level, as "Disable external clock loopback".

The way it is now, it shows up at the end of the controller list, not indented, as if it's some kind of generic MMC configuration option.

Quoted 9 lines
Cc Marcel Ziswiler <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jaehoon Chung <[email protected]>
Cc Tom Warren <[email protected]>
---
 drivers/mmc/Kconfig | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
#3 lore raw

PATCH 1/1 mmc: Move tegra loopback disable option to be under tegra

In reply to Trent Piepho
Quoted 6 lines · Trent Piepho

This is a configuration option specific to the tegra controller.

Doing it this way makes it show up directly under the tegra controller
option, indented one level, as "Disable external clock loopback".

Quoted 8 lines

The way it is now, it shows up at the end of the controller list, not indented, as if it's some kind of generic MMC configuration option.

Cc Marcel Ziswiler <[email protected]>
Cc Simon Glass <[email protected]>
Cc Jaehoon Chung <[email protected]>
Cc Tom Warren <[email protected]>
Quoted 50 lines
---
 drivers/mmc/Kconfig | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/mmc/Kconfig +5 -0
index 08c2dd2541..759a1cceb4 100644
@@ -542,6 +542,17 @@ config MMC_SDHCI_TEGRA
 
 	  If unsure, say N.
 
+config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
+	bool "Disable external clock loopback"
+	depends on MMC_SDHCI_TEGRA && TEGRA124
+	help
+	  Disable the external clock loopback and use the internal one

on SDMMC3

drivers/mmc/Kconfig +1 -0
+	  as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1

bits

drivers/mmc/Kconfig +3 -0
+	  being set to 0xfffd according to the TRM.
+
+	  TODO(marcel.ziswiler at toradex.com): Move to device tree

controlled

drivers/mmc/Kconfig +2 -5
+	  approach once proper kernel integration made it mainline.
+
 config MMC_SDHCI_ZYNQ
 	bool "Arasan SDHCI controller support"
 	depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
@@ -627,17 +638,6 @@ config FSL_ESDHC
 
 endif
 
-config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
-	bool "Disable external clock loopback"
-	depends on MMC_SDHCI_TEGRA && TEGRA124
-	help
-	  Disable the external clock loopback and use the internal one

on SDMMC3

drivers/mmc/Kconfig +0 -1
-	  as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1

bits

drivers/mmc/Kconfig +0 -3
-	  being set to 0xfffd according to the TRM.
-
-	  TODO(marcel.ziswiler at toradex.com): Move to device tree

controlled

drivers/mmc/Kconfig +0 -2
-	  approach once proper kernel integration made it mainline.
-
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111