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 <anshuld@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-airoha/Kconfig b/arch/arm/mach-airoha/Kconfig
index b9cd0a413e106908b08dc11ff561f36a011f702c..4b0374001d0cc2ce5b59e377418c1ecc12f33e87 100644 (file)
--- a/arch/arm/mach-airoha/Kconfig
+++ b/arch/arm/mach-airoha/Kconfig
@@ -10,6 +10,7 @@ config TARGET_EN7523
        bool "Airoha EN7523 SoC"
        select CPU_V7A
        select ARMV7_SET_CORTEX_SMPEN
+       select REGMAP
        help
          The Airoha EN7523 family (en7523/en7529/en7562) is an ARM-based
          SoCs with a dual-core CPU. It comes with Wi-Fi 5/6 support and

diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig
index 9cf60378c1180d8ace763a25aeb663c6b50ec360..c88b1e59366e99cb68c6a8c67a2228b6d58d50d5 100644 (file)
--- a/arch/arm/mach-aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@ -18,6 +18,7 @@ config ASPEED_AST2500
        bool "Support Aspeed AST2500 SoC"
        select CPU_ARM1176
        select DM_RESET
+       select REGMAP
        help
          The Aspeed AST2500 is a ARM-based SoC with arm1176 CPU.
          It is used as Board Management Controller on many server boards,

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 8ac83420ee22874617819b58781c0684dae4fa0b..0dc72c8742372ba951b4385480152bd90bf678cd 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -73,6 +73,7 @@ config TARGET_KMTEPR2
 config TARGET_GAZERBEAM
        bool "Support gazerbeam"
        select ARCH_MPC8308
+       select REGMAP
        select SYS_FSL_ERRATUM_ESDHC111
        imply ENV_IS_IN_FLASH
        help

diff --git a/configs/imx8m_data_modul.config b/configs/imx8m_data_modul.config
index 4634a0972f09673f42812e5fc68af16b803c9369..18c7bb536fa074b88871715b3841a0391e3b29d3 100644 (file)
--- a/configs/imx8m_data_modul.config
+++ b/configs/imx8m_data_modul.config
@@ -149,7 +149,6 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_PROT_TCP_SACK=y
-CONFIG_REGMAP=y
 CONFIG_RGMII=y
 CONFIG_RTC_M41T62=y
 CONFIG_SF_DEFAULT_SPEED=50000000

diff --git a/configs/imx95_evk.config b/configs/imx95_evk.config
index 3db583cce5978d12ae8789364076caa0cfb10497..e7832d86fe910d03b2609e035353507d828e6261 100644 (file)
--- a/configs/imx95_evk.config
+++ b/configs/imx95_evk.config
@@ -92,7 +92,6 @@ CONFIG_ETHPRIME="eth0"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SPL_DM=y
-CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_CLK=y

diff --git a/configs/imx_dhsom.config b/configs/imx_dhsom.config
index 4a3ddc7e90b761d48095a484b8e7a7462914286c..a0d67c8a0688bbbe0f04a5fdce856a7b766953ae 100644 (file)
--- a/configs/imx_dhsom.config
+++ b/configs/imx_dhsom.config
@@ -28,7 +28,6 @@ CONFIG_ENV_SECT_SIZE_AUTO=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 
-CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 
 CONFIG_DM_GPIO=y

diff --git a/configs/kontron-osm-s-mx8mp.config b/configs/kontron-osm-s-mx8mp.config
index a8881726e0794ae6b988b48c51019b57c1f42eaf..786fd3e7a6de0104e87b5994f0b013b253a697ef 100644 (file)
--- a/configs/kontron-osm-s-mx8mp.config
+++ b/configs/kontron-osm-s-mx8mp.config
@@ -117,7 +117,6 @@ CONFIG_TFTP_TSIZE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y

diff --git a/configs/kontron-osm-s-mx93.config b/configs/kontron-osm-s-mx93.config
index a6d316de3d874660b191d8134a92d8177affd416..c2d4de4efa8a9e566c58a504b277a1ab2f491762 100644 (file)
--- a/configs/kontron-osm-s-mx93.config
+++ b/configs/kontron-osm-s-mx93.config
@@ -115,7 +115,6 @@ CONFIG_TFTP_TSIZE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_ADC=y
 CONFIG_ADC_IMX93=y

diff --git a/configs/renesas_rcar64.config b/configs/renesas_rcar64.config
index c2cb88dc157f485d05c99308170cb7a20a2775b4..da4b262fc6a525826f11ebbf71a66b58a76d7090 100644 (file)
--- a/configs/renesas_rcar64.config
+++ b/configs/renesas_rcar64.config
@@ -6,7 +6,6 @@ CONFIG_CMD_TEMPERATURE=y
 CONFIG_DM_THERMAL=y
 CONFIG_PHY_ANEG_TIMEOUT=20000
 CONFIG_RCAR_GEN3_THERMAL=y
-CONFIG_REGMAP=y
 CONFIG_REMAKE_ELF=y
 CONFIG_RENESAS_RPC_SPI=y
 CONFIG_SUPPORT_RAW_INITRD=y

diff --git a/drivers/clk/microchip/Kconfig b/drivers/clk/microchip/Kconfig
index 62072e100b18451487417931bbc70e37b8c3e98b..6ac7c9c56547ebc2010a93f78321cefa872ee651 100644 (file)
--- 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 c9253099e6eac22862156929384e4196201a3266..5419bf65b5d653464f8bf958382ede30954d6402 100644 (file)
--- 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 ce2d23756dfe20f0b3b5dfc5149c85c42bc414ed..b2dfc7f5b663a60220e2878d3f78c25e39a1d693 100644 (file)
--- 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 39caf2eff1b723320947e954b6c2659e60074b50..22bd3a972bdfc54817927ba43e8349133cf1cdb9 100644 (file)
--- 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.