apm821xx: move CONFIG_REGULATOR to target config

This moves CONFIG_REGULATOR to the target config instead of the
subtarget config.

For kernel 5.10, CONFIG_AT803X_PHY depends on CONFIG_REGULATOR.
As we do not have a size constraint, move this symbol to the
target configuration for kernel 5.4 as well as 5.10.

Reported-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: David Bauer <mail@david-bauer.net>

diff --git a/target/linux/apm821xx/config-5.10 b/target/linux/apm821xx/config-5.10
index c9c720de299a27dea3f884e0f72a8acad00c5c62..b729bee90364c2caea3abdab06551c163cbfb414 100644 (file)
--- a/target/linux/apm821xx/config-5.10
+++ b/target/linux/apm821xx/config-5.10
@@ -250,6 +250,7 @@ CONFIG_PTE_64BIT=y
 # CONFIG_RAINIER is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
+CONFIG_REGULATOR=y
 CONFIG_RSEQ=y
 # CONFIG_SAM440EP is not set
 # CONFIG_SCOM_DEBUGFS is not set

diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4
index 2b9594c3d477e629818f871173b33067e6adbe99..e47186a4447abe54edde6f39147542aee1df8565 100644 (file)
--- a/target/linux/apm821xx/config-5.4
+++ b/target/linux/apm821xx/config-5.4
@@ -304,6 +304,7 @@ CONFIG_PPC_WERROR=y
 CONFIG_PTE_64BIT=y
 # CONFIG_RAINIER is not set
 CONFIG_RAS=y
+CONFIG_REGULATOR=y
 CONFIG_RSEQ=y
 # CONFIG_SAM440EP is not set
 # CONFIG_SCOM_DEBUGFS is not set

diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default
index db2c5c8a307c164b8436cc4400f7946e36814656..c3f41c785b99337795c9408bb831c2749962393b 100644 (file)
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@@ -40,5 +40,4 @@ CONFIG_PPC_EARLY_DEBUG_44x=y
 # CONFIG_PPC_EARLY_DEBUG_MEMCONS is not set
 CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x4
 CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y