aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-06-13 00:05:59 +0200
committerDavid Bauer <mail@david-bauer.net>2021-06-13 11:32:49 +0200
commit52ee96c35ccb50b42e656d56e9daef7a4ae10ab1 (patch)
tree201f0659c3a83a8f6b5511d7f7eedb3a8f149256
parentc44cefceb3add724c135a4f57209ce66af5d40c9 (diff)
downloadupstream-52ee96c35ccb50b42e656d56e9daef7a4ae10ab1.tar.gz
upstream-52ee96c35ccb50b42e656d56e9daef7a4ae10ab1.tar.bz2
upstream-52ee96c35ccb50b42e656d56e9daef7a4ae10ab1.zip
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>
-rw-r--r--target/linux/apm821xx/config-5.101
-rw-r--r--target/linux/apm821xx/config-5.41
-rw-r--r--target/linux/apm821xx/sata/config-default1
3 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/apm821xx/config-5.10 b/target/linux/apm821xx/config-5.10
index c9c720de29..b729bee903 100644
--- 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 2b9594c3d4..e47186a444 100644
--- 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 db2c5c8a30..c3f41c785b 100644
--- 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