aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-06-16 11:14:25 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-06-16 11:15:29 +0200
commit5d88bfdc1f3b7fca987002d9b7cd069101f98edb (patch)
tree8bbb30ac91d596e56db0b234a6006a76bad2d957 /target
parent83314c13d0a85f54b0e3c9726a9062268f638212 (diff)
Revert "ipq806x: disable cache and fabric devfreq driver to improve stability"
This reverts commit 60fc93b35935a88b1e31d853a0abacf0847d8de4. Reenable devfreq and revert for both 5.15 and 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ipq806x/config-5.159
-rw-r--r--target/linux/ipq806x/config-6.14
2 files changed, 9 insertions, 4 deletions
diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15
index 902da14813..bdbc756ab0 100644
--- a/target/linux/ipq806x/config-5.15
+++ b/target/linux/ipq806x/config-5.15
@@ -35,8 +35,8 @@ CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_CRYPTO=y
CONFIG_ARM_GIC=y
CONFIG_ARM_HAS_SG_CHAIN=y
-# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set
-# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
+CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y
+CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y
@@ -125,6 +125,11 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
# CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set
# CONFIG_DEVFREQ_GOV_USERSPACE is not set
# CONFIG_DEVFREQ_THERMAL is not set
+<<<<<<< HEAD
+=======
+CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y
+CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y
+>>>>>>> parent of 60fc93b359 (ipq806x: disable cache and fabric devfreq driver to improve stability)
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_DMA_OF=y
diff --git a/target/linux/ipq806x/config-6.1 b/target/linux/ipq806x/config-6.1
index 02d310653b..b96f2081bd 100644
--- a/target/linux/ipq806x/config-6.1
+++ b/target/linux/ipq806x/config-6.1
@@ -39,8 +39,8 @@ CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_CRYPTO=y
CONFIG_ARM_GIC=y
CONFIG_ARM_HAS_SG_CHAIN=y
-# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set
-# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
+CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y
+CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y