diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 18:54:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 18:54:34 +0200 |
| commit | 9414d65d8b7ea41fa4062642910711cf434ae923 (patch) | |
| tree | 218bf3dbee00e2201f8b7a0ac30631c4f3ec8820 /arch | |
| parent | 77319e88df21c49723580c07dbe96c81e5464684 (diff) | |
| parent | 9b1e6ce34a1ab6d205effa7da38ea520f04d4e03 (diff) | |
| download | linux-9414d65d8b7ea41fa4062642910711cf434ae923.tar.gz | |
Merge tag 'sunxi-config64-for-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
Allwinner arm64 defconfig changes for 5.4 Two patches to enable the IR receiver and the SPDIF transceiver found on the Allwinner SoCs. * tag 'sunxi-config64-for-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: defconfig: Enable Sun4i SPDIF module arm64: defconfig: Enable IR SUNXI option Link: https://lore.kernel.org/r/24f215ca-f3a8-4497-bf98-9ba1808b37be.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 94c3d1e3b40c..1a252ca6ce75 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -492,6 +492,7 @@ CONFIG_RC_CORE=m CONFIG_RC_DECODERS=y CONFIG_RC_DEVICES=y CONFIG_IR_MESON=m +CONFIG_IR_SUNXI=m CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y @@ -561,6 +562,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_SAMSUNG=y CONFIG_SND_SOC_RCAR=m +CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m |