Skip to content

Commit 042f2e1

Browse files
linuswarndb
authored andcommitted
ARM: configs: Update u8500_defconfig
The platform lost the framebuffer due to a commit solving a circular dependency in v5.14-rc1, so add it back in by explicitly selecting the framebuffer. The U8500 has also gained a few systems using touchscreens from Cypress, Melfas and Zinitix so add these at the same time as we're updating the defconfig anyway. Fixes: f611b1e ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij <[email protected]> Cc: [email protected] Cc: Kees Cook <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Stephan Gerhold <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]' Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 49e7757 commit 042f2e1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

arch/arm/configs/u8500_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ CONFIG_INPUT_TOUCHSCREEN=y
6161
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
6262
CONFIG_TOUCHSCREEN_BU21013=y
6363
CONFIG_TOUCHSCREEN_CY8CTMA140=y
64+
CONFIG_TOUCHSCREEN_CYTTSP_CORE=y
65+
CONFIG_TOUCHSCREEN_CYTTSP_SPI=y
66+
CONFIG_TOUCHSCREEN_MMS114=y
67+
CONFIG_TOUCHSCREEN_ZINITIX=y
6468
CONFIG_INPUT_MISC=y
6569
CONFIG_INPUT_AB8500_PONKEY=y
6670
CONFIG_INPUT_GPIO_VIBRA=y
@@ -100,6 +104,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=y
100104
CONFIG_DRM_PANEL_SONY_ACX424AKP=y
101105
CONFIG_DRM_LIMA=y
102106
CONFIG_DRM_MCDE=y
107+
CONFIG_FB=y
103108
CONFIG_BACKLIGHT_CLASS_DEVICE=y
104109
CONFIG_BACKLIGHT_KTD253=y
105110
CONFIG_BACKLIGHT_GPIO=y

0 commit comments

Comments
 (0)