From 52ee96c35ccb50b42e656d56e9daef7a4ae10ab1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 13 Jun 2021 00:05:59 +0200 Subject: [PATCH] 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 Signed-off-by: David Bauer --- target/linux/apm821xx/config-5.10 | 1 + target/linux/apm821xx/config-5.4 | 1 + target/linux/apm821xx/sata/config-default | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/apm821xx/config-5.10 b/target/linux/apm821xx/config-5.10 index c9c720de299..b729bee9036 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 2b9594c3d47..e47186a4447 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 db2c5c8a307..c3f41c785b9 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 -- 2.30.2