summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-05-21 23:52:10 +0200
committerArnd Bergmann <arnd@arndb.de>2020-05-21 23:52:11 +0200
commit6e15f0a9c49896d8db4aa0b258efb255af14294e (patch)
tree13da2a0b8b409b23892ba188b900624c93f14c87
parentMerge tag 'renesas-arm-defconfig-for-v5.8-tag2' of git://git.kernel.org/pub/s... (diff)
parentarm64: configs: Enable sun50i cpufreq nvmem (diff)
downloadlinux-6e15f0a9c49896d8db4aa0b258efb255af14294e.tar.xz
linux-6e15f0a9c49896d8db4aa0b258efb255af14294e.zip
Merge tag 'sunxi-config-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
Two patches to enable the new cpufreq support on the H6 for the arm64 defconfig to enable the audio codec in sunxi_defconfig. * tag 'sunxi-config-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: configs: Enable sun50i cpufreq nvmem ARM: configs: sunxi: Add sun8i analog codec Link: https://lore.kernel.org/r/9fd4d403-f6c8-420d-8b03-62e8485a0b3d.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/sunxi_defconfig1
-rw-r--r--arch/arm64/configs/defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 61b8be19e527..b105ce7120cc 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -107,6 +107,7 @@ CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_SUN4I_CODEC=y
+CONFIG_SND_SUN8I_CODEC_ANALOG=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 03d0189f7d68..488752164bf5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -84,6 +84,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPUFREQ_DT=y
CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_IMX_CPUFREQ_DT=m