Merge tag 'at91-4.20-defconfig' of... (0faa7d1b) · Commits · 戴 / test

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>

arch/arm/configs/multi_v7_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/configs/sama5_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ CONFIG_KEYBOARD_QT1070=y
		CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_ADC=y
		CONFIG_TOUCHSCREEN_ATMEL_MXT=y
		# CONFIG_SERIO is not set
		CONFIG_LEGACY_PTY_COUNT=4
		@@ -167,6 +168,7 @@ CONFIG_SND_ATMEL_SOC_WM8904=y
		# CONFIG_HID_GENERIC is not set
		CONFIG_SND_ATMEL_SOC_PDMIC=y
		CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m
		CONFIG_SND_ATMEL_SOC_I2S=y
		CONFIG_USB=y
		CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
		CONFIG_USB_EHCI_HCD=y

Admin message