ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-22 12:05:32 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5d88bfdc1f3b7fca987002d9b7cd069101f98edb.

The revert contains merge error.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-06-16 11:28:39 +02:00
parent 6f5ea752d7
commit 6d673c748b
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ipq806x/config-5.15
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=y
CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y
# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set
# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y
@ -125,11 +125,6 @@ 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

4
target/linux/ipq806x/config-6.1
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=y
CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y
# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set
# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y