core: Rework REGMAP symbols implementation

As exposed by "make randconfig", we have an issue with the dependencies
for REGMAP (and xPL variants). As this is a library function, it should
always be selected and not depended on by other functionality. This is
largely done correctly today, so just correct the few outliers.

Acked-by: Anshul Dalal <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

4 files changed, 15 insertions, 11 deletions

diff --git a/drivers/clk/microchip/Kconfig b/drivers/clk/microchip/Kconfig
index 62072e100b1..6ac7c9c5654 100644
--- a/drivers/clk/microchip/Kconfig
+++ b/drivers/clk/microchip/Kconfig
@@ -2,6 +2,5 @@ config CLK_MPFS
 	bool "Clock support for Microchip PolarFire SoC"
 	depends on CLK && CLK_CCF
 	depends on SYSCON
-	depends on REGMAP
 	help
 	  This enables support clock driver for Microchip PolarFire SoC platform.
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index c9253099e6e..5419bf65b5d 100644
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -195,7 +195,7 @@ config DM_DMA
 	  the physical address space.
 
 config REGMAP
-	bool "Support register maps"
+	bool
 	depends on DM
 	select DEVRES
 	help
@@ -206,7 +206,7 @@ config REGMAP
 	  direct memory access.
 
 config SPL_REGMAP
-	bool "Support register maps in SPL"
+	bool
 	depends on SPL_DM
 	help
 	  Hardware peripherals tend to have one or more sets of registers
@@ -216,7 +216,7 @@ config SPL_REGMAP
 	  direct memory access.
 
 config TPL_REGMAP
-	bool "Support register maps in TPL"
+	bool
 	depends on TPL_DM
 	help
 	  Hardware peripherals tend to have one or more sets of registers
@@ -226,7 +226,7 @@ config TPL_REGMAP
 	  direct memory access.
 
 config VPL_REGMAP
-	bool "Support register maps in VPL"
+	bool
 	depends on VPL_DM
 	help
 	  Hardware peripherals tend to have one or more sets of registers
@@ -237,7 +237,7 @@ config VPL_REGMAP
 
 config SYSCON
 	bool "Support system controllers"
-	depends on REGMAP
+	select REGMAP
 	help
 	  Many SoCs have a number of system controllers which are dealt with
 	  as a group by a single driver. Some common functionality is provided
@@ -246,7 +246,8 @@ config SYSCON
 
 config SPL_SYSCON
 	bool "Support system controllers in SPL"
-	depends on SPL_REGMAP
+	depends on SPL_DM
+	select SPL_REGMAP
 	help
 	  Many SoCs have a number of system controllers which are dealt with
 	  as a group by a single driver. Some common functionality is provided
@@ -255,7 +256,8 @@ config SPL_SYSCON
 
 config TPL_SYSCON
 	bool "Support system controllers in TPL"
-	depends on TPL_REGMAP
+	depends on TPL_DM
+	select TPL_REGMAP
 	help
 	  Many SoCs have a number of system controllers which are dealt with
 	  as a group by a single driver. Some common functionality is provided
@@ -264,7 +266,8 @@ config TPL_SYSCON
 
 config VPL_SYSCON
 	bool "Support system controllers in VPL"
-	depends on VPL_REGMAP
+	depends on VPL_DM
+	select VPL_REGMAP
 	help
 	  Many SoCs have a number of system controllers which are dealt with
 	  as a group by a single driver. Some common functionality is provided
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index ce2d23756df..b2dfc7f5b66 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -351,7 +351,8 @@ config MXS_OCOTP
 
 config NPCM_HOST
 	bool "Enable support espi or LPC for Host"
-	depends on REGMAP && SYSCON
+	depends on SYSCON
+	select REGMAP
 	help
 	  Enable NPCM BMC espi or LPC support for Host reading and writing.
 
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 39caf2eff1b..22bd3a972bd 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -627,8 +627,9 @@ config MMC_SDHCI_AM654
 	depends on ARCH_K3
 	depends on MMC_SDHCI
 	depends on OF_CONTROL
-	depends on REGMAP
 	select MMC_SDHCI_IO_ACCESSORS
+	select REGMAP
+	select SPL_REGMAP if SPL_MMC
 	help
 	  Support for Secure Digital Host Controller Interface (SDHCI)
 	  controllers present on TI's AM654 SOCs.