Skip to content

Commit 6e15f0a

Browse files
committed
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 <[email protected]>
2 parents c0feb18 + cdaeaa2 commit 6e15f0a

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/sunxi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ CONFIG_SOUND=y
107107
CONFIG_SND=y
108108
CONFIG_SND_SOC=y
109109
CONFIG_SND_SUN4I_CODEC=y
110+
CONFIG_SND_SUN8I_CODEC_ANALOG=y
110111
CONFIG_USB=y
111112
CONFIG_USB_EHCI_HCD=y
112113
CONFIG_USB_EHCI_HCD_PLATFORM=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
8484
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
8585
CONFIG_CPUFREQ_DT=y
8686
CONFIG_ACPI_CPPC_CPUFREQ=m
87+
CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
8788
CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
8889
CONFIG_ARM_SCPI_CPUFREQ=y
8990
CONFIG_ARM_IMX_CPUFREQ_DT=m

0 commit comments

Comments
 (0)