diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 17:15:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 17:16:00 +0100 |
| commit | 6f7cdd2fbfffbeb9de3d2bd1855c2ef72f0e7ef0 (patch) | |
| tree | fb415512d38663472b4f98562fd55138efe7c113 /arch/arm/configs | |
| parent | 69f7aeee06674daa1950e04dc61de0c6e70586fc (diff) | |
| parent | 950be99fccffa920e148fd46e33db4d509e8af63 (diff) | |
| download | linux-6f7cdd2fbfffbeb9de3d2bd1855c2ef72f0e7ef0.tar.gz linux-6f7cdd2fbfffbeb9de3d2bd1855c2ef72f0e7ef0.tar.bz2 linux-6f7cdd2fbfffbeb9de3d2bd1855c2ef72f0e7ef0.zip | |
Merge tag 'arm-soc/for-5.11/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains ARM multi_v7_defconfig changes for 5.11,
please pull the following:
- Florian enables the ARM SCMI protocol, and the common clock, HWMON and
CPU frequency scaling drivers since those are used by ARCH_BRCMSTB
platforms
* tag 'arm-soc/for-5.11/defconfig' of https://github.com/Broadcom/stblinux:
ARM: multi_v7_defconfig: Enable ARM SCMI protocol and drivers
Link: https://lore.kernel.org/r/20201128163410.1691529-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a2b1063c0f46..c0d128d669b1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -109,6 +109,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_ARM_RASPBERRYPI_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y @@ -117,6 +118,7 @@ CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y CONFIG_ARM_TEGRA_CPUIDLE=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_BCM47XX_NVRAM=y @@ -493,6 +495,7 @@ CONFIG_CHARGER_MAX77693=m CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_MAX8998=m CONFIG_CHARGER_TPS65090=y +CONFIG_SENSORS_ARM_SCMI=y CONFIG_SENSORS_ASPEED=m CONFIG_SENSORS_IIO_HWMON=y CONFIG_SENSORS_LM90=y @@ -968,6 +971,7 @@ CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_S2MPS11=m CONFIG_CLK_RASPBERRYPI=y CONFIG_COMMON_CLK_QCOM=y |