Skip to content

Commit 07e1a49

Browse files
committed
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: Krzysztof Kozlowski <[email protected]>
2 parents 95c3f54 + 1f17fce commit 07e1a49

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

arch/arm/configs/sama7_defconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ CONFIG_CAN_M_CAN_PLATFORM=y
108108
CONFIG_INPUT_EVDEV=y
109109
CONFIG_KEYBOARD_GPIO=y
110110
# CONFIG_INPUT_MOUSE is not set
111+
CONFIG_INPUT_TOUCHSCREEN=y
112+
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
111113
CONFIG_LEGACY_PTY_COUNT=4
112114
CONFIG_SERIAL_ATMEL=y
113115
CONFIG_SERIAL_ATMEL_CONSOLE=y
@@ -133,6 +135,7 @@ CONFIG_GENERIC_ADC_THERMAL=y
133135
CONFIG_WATCHDOG=y
134136
CONFIG_SAMA5D4_WATCHDOG=y
135137
CONFIG_MFD_ATMEL_FLEXCOM=y
138+
CONFIG_MFD_ATMEL_HLCDC=y
136139
CONFIG_REGULATOR=y
137140
CONFIG_REGULATOR_FIXED_VOLTAGE=y
138141
CONFIG_REGULATOR_MCP16502=y
@@ -147,6 +150,12 @@ CONFIG_VIDEO_MICROCHIP_CSI2DC=y
147150
CONFIG_VIDEO_IMX219=m
148151
CONFIG_VIDEO_IMX274=m
149152
CONFIG_VIDEO_OV5647=m
153+
CONFIG_DRM=y
154+
CONFIG_DRM_ATMEL_HLCDC=y
155+
CONFIG_DRM_MICROCHIP_LVDS_SERIALIZER=y
156+
CONFIG_DRM_PANEL_SIMPLE=y
157+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
158+
CONFIG_BACKLIGHT_PWM=y
150159
CONFIG_SOUND=y
151160
CONFIG_SND=y
152161
CONFIG_SND_SOC=y
@@ -197,6 +206,7 @@ CONFIG_AT91_SAMA5D2_ADC=y
197206
CONFIG_PAC1934=m
198207
CONFIG_PWM=y
199208
CONFIG_PWM_ATMEL=y
209+
CONFIG_PWM_ATMEL_HLCDC_PWM=y
200210
CONFIG_MCHP_EIC=y
201211
CONFIG_RESET_CONTROLLER=y
202212
CONFIG_NVMEM_MICROCHIP_OTPC=y

0 commit comments

Comments
 (0)