Revert "ipq806x: disable cache and fabric devfreq driver to improve stability"

This reverts commit 60fc93b359.

Reenable devfreq and revert for both 5.15 and 6.1.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-06-16 11:14:25 +02:00
parent 83314c13d0
commit 5d88bfdc1f
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 9 additions and 4 deletions

View File

@ -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

View File

@ -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