diff options
author | Olof Johansson <olof@lixom.net> | 2018-09-25 13:53:00 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-25 13:53:00 -0700 |
commit | 0faa7d1b8692b88971112af9209c04d5d55578c1 (patch) | |
tree | f445bdad6b06d586c868dcaa6a9dd761e1164eed /arch/arm/configs/multi_v7_defconfig | |
parent | 478bf0b470987a7d833999ff5066e3752182bf93 (diff) | |
parent | 4eb2534057b1b01014a2b2bb6898d9934d2ba831 (diff) |
Merge tag 'at91-4.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/defconfig
AT91 defconfig for 4.20
- addition of sama5 I2S
- addition of generic ADC resistive touchscreen
* tag 'at91-4.20-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: multi_v7_defconfig: add Atmel I2S driver
ARM: configs: at91: Add I2S driver to sama5
ARM: multi_v7_defconfig: add generic resistive touchscreen
ARM: configs: at91: add generic resistive touchscreen to sama5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index f6b88139cbcb..cdd90430ba83 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -282,6 +282,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_ELAN_I2C=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_WM97XX=m @@ -656,6 +657,7 @@ CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_ATMEL_SOC_WM8904=m CONFIG_SND_ATMEL_SOC_PDMIC=m +CONFIG_SND_ATMEL_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_SOC_FSL_SAI=m CONFIG_SND_SOC_ROCKCHIP=m |