Skip to content

Commit 47c4229

Browse files
committed
Merge branch 'linux-6.6-trunk/at91/config' into linux-6.6-mchp
2 parents 269fe74 + 3fb9fad commit 47c4229

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ CONFIG_VIDEO_MT9V032=m
201201
CONFIG_VIDEO_OV2640=m
202202
CONFIG_VIDEO_OV7740=m
203203
CONFIG_DRM=y
204+
CONFIG_DRM_FBDEV_EMULATION=y
204205
CONFIG_DRM_ATMEL_HLCDC=y
205206
CONFIG_DRM_MICROCHIP_DW_MIPI_DSI=y
206207
CONFIG_DRM_PANEL_SIMPLE=y
@@ -210,6 +211,7 @@ CONFIG_FB_ATMEL=y
210211
CONFIG_BACKLIGHT_ATMEL_LCDC=y
211212
CONFIG_BACKLIGHT_PWM=y
212213
CONFIG_BACKLIGHT_CLASS_DEVICE=y
214+
# CONFIG_FRAMEBUFFER_CONSOLE is not set
213215
CONFIG_SOUND=y
214216
CONFIG_SND=y
215217
CONFIG_SND_USB_AUDIO=y

arch/arm/configs/sama5_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,15 @@ CONFIG_VIDEO_OV5640=m
237237
CONFIG_VIDEO_OV7670=m
238238
CONFIG_VIDEO_OV7740=m
239239
CONFIG_DRM=y
240+
CONFIG_DRM_FBDEV_EMULATION=y
240241
CONFIG_DRM_ATMEL_HLCDC=y
241242
CONFIG_DRM_PANEL_SIMPLE=y
242243
CONFIG_DRM_PANEL_EDP=y
243244
CONFIG_DRM_SII902X=y
244245
CONFIG_LCD_CLASS_DEVICE=y
245246
CONFIG_BACKLIGHT_CLASS_DEVICE=y
246247
CONFIG_BACKLIGHT_PWM=y
248+
# CONFIG_FRAMEBUFFER_CONSOLE is not set
247249
CONFIG_SOUND=y
248250
CONFIG_SND=y
249251
CONFIG_SND_USB_AUDIO=y

0 commit comments

Comments
 (0)