Merge tag 'v5.17-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 1 Mar 2022 10:28:28 +0000 (11:28 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 1 Mar 2022 10:28:29 +0000 (11:28 +0100)
- Enable Airoha SoC on armv7 config.
- Enable CPU freq for arm64 based SoCs.
- Enable PMIC based (mt6397) RTC for mt8173

* tag 'v5.17-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  ARM: multi_v7_defconfig: Add support for Airoha EN7523 SoC
  arm64: defconfig: Enable cpufreq for MediaTek
  arm64: defconfig: Enable MT6397 RTC

Link: https://lore.kernel.org/r/9b90b407-025b-ec78-a626-faccdbc7ab39@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/configs/multi_v7_defconfig
arch/arm64/configs/defconfig

Simple merge
@@@ -97,7 -96,17 +97,8 @@@ CONFIG_ARM_QCOM_CPUFREQ_HW=
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
  CONFIG_ARM_SCMI_CPUFREQ=y
  CONFIG_ARM_TEGRA186_CPUFREQ=y
+ CONFIG_ARM_MEDIATEK_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
 -CONFIG_ARM_SCMI_PROTOCOL=y
 -CONFIG_ARM_SCPI_PROTOCOL=y
 -CONFIG_RASPBERRYPI_FIRMWARE=y
 -CONFIG_INTEL_STRATIX10_SERVICE=y
 -CONFIG_INTEL_STRATIX10_RSU=m
 -CONFIG_QCOM_SCM=y
 -CONFIG_EFI_CAPSULE_LOADER=y
 -CONFIG_IMX_SCU=y
 -CONFIG_IMX_SCU_PD=y
  CONFIG_ACPI=y
  CONFIG_ACPI_APEI=y
  CONFIG_ACPI_APEI_GHES=y