Commit 3a369870 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-5.4/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains Broadcom ARM-based SoCs defconfig updates for
5.4, please pull the following:

- Nicolas enables the Raspberry Pi CPUFREQ driver in both
  bcm2835_defconfig and multi_v7_defconfig

* tag 'arm-soc/for-5.4/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: defconfig: enable cpufreq driver for RPi
parents e29de963 c474106e
...@@ -37,6 +37,14 @@ CONFIG_CMA=y ...@@ -37,6 +37,14 @@ CONFIG_CMA=y
CONFIG_SECCOMP=y CONFIG_SECCOMP=y
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y CONFIG_CRASH_DUMP=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPUFREQ_DT=y
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
CONFIG_VFP=y CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_SUSPEND is not set # CONFIG_SUSPEND is not set
...@@ -132,6 +140,7 @@ CONFIG_DMA_BCM2835=y ...@@ -132,6 +140,7 @@ CONFIG_DMA_BCM2835=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_SND_BCM2835=m CONFIG_SND_BCM2835=m
CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_BCM2835=m
CONFIG_CLK_RASPBERRYPI=y
CONFIG_MAILBOX=y CONFIG_MAILBOX=y
CONFIG_BCM2835_MBOX=y CONFIG_BCM2835_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
......
...@@ -104,6 +104,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m ...@@ -104,6 +104,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT=y
CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_ARM_IMX6Q_CPUFREQ=y
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
CONFIG_QORIQ_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y
CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y CONFIG_ARM_CPUIDLE=y
...@@ -920,6 +921,7 @@ CONFIG_STAGING_BOARD=y ...@@ -920,6 +921,7 @@ CONFIG_STAGING_BOARD=y
CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_MAX77686=y
CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_CLK_RASPBERRYPI=y
CONFIG_COMMON_CLK_QCOM=y CONFIG_COMMON_CLK_QCOM=y
CONFIG_QCOM_CLK_RPM=y CONFIG_QCOM_CLK_RPM=y
CONFIG_APQ_MMCC_8084=y CONFIG_APQ_MMCC_8084=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment