Commit 07e1a498 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'at91-defconfig-7.1' of... 

Merge tag 'at91-defconfig-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/defconfig

Microchip AT91 defconfig updates for v7.1

This update includes:
- LCD controller, LVDS controller, backlight, simple pannel, touchscreen
  configuration flags required by SAMA7D65 SoC

* tag 'at91-defconfig-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: configs: at91: sama7: enable LVDS serializer support
  ARM: configs: at91: sama7: enable config for atmel maxtouch
  ARM: configs: at91: sama7: enable DRM hlcdc support

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 95c3f54d 1f17fce8

arch/arm/configs/sama7_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ CONFIG_CAN_M_CAN_PLATFORM=y 
CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_LEGACY_PTY_COUNT=4

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y
@@ -133,6 +135,7 @@ CONFIG_GENERIC_ADC_THERMAL=y 
CONFIG_WATCHDOG=y

CONFIG_SAMA5D4_WATCHDOG=y

CONFIG_MFD_ATMEL_FLEXCOM=y

CONFIG_MFD_ATMEL_HLCDC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MCP16502=y
@@ -147,6 +150,12 @@ CONFIG_VIDEO_MICROCHIP_CSI2DC=y 
CONFIG_VIDEO_IMX219=m

CONFIG_VIDEO_IMX274=m

CONFIG_VIDEO_OV5647=m

CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y

CONFIG_DRM_MICROCHIP_LVDS_SERIALIZER=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y
@@ -197,6 +206,7 @@ CONFIG_AT91_SAMA5D2_ADC=y 
CONFIG_PAC1934=m

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_PWM_ATMEL_HLCDC_PWM=y

CONFIG_MCHP_EIC=y

CONFIG_RESET_CONTROLLER=y

CONFIG_NVMEM_MICROCHIP_OTPC=y