Skip to content

Commit 6568ef7

Browse files
noglitchcristibirsan
authored andcommitted
ARM: at91/defconfig: move to v4l2 for video capture
Move for both sama5 and at91_dt defconfig files. Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
1 parent 7132f4e commit 6568ef7

2 files changed

Lines changed: 21 additions & 11 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,17 @@ CONFIG_MEDIA_SUPPORT=y
138138
CONFIG_MEDIA_CAMERA_SUPPORT=y
139139
CONFIG_MEDIA_USB_SUPPORT=y
140140
CONFIG_USB_VIDEO_CLASS=m
141+
# CONFIG_USB_GSPCA is not set
141142
CONFIG_V4L_PLATFORM_DRIVERS=y
142-
CONFIG_SOC_CAMERA=y
143143
CONFIG_VIDEO_ATMEL_ISI=y
144-
CONFIG_SOC_CAMERA_OV2640=m
144+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
145+
CONFIG_VIDEO_OV2640=m
146+
CONFIG_VIDEO_OV2659=m
147+
CONFIG_VIDEO_OV7640=m
148+
CONFIG_VIDEO_OV7670=m
149+
# CONFIG_DVB_AU8522_V4L is not set
150+
# CONFIG_DVB_TUNER_DIB0070 is not set
151+
# CONFIG_DVB_TUNER_DIB0090 is not set
145152
CONFIG_DRM=y
146153
CONFIG_DRM_ATMEL_HLCDC=y
147154
CONFIG_DRM_PANEL_SIMPLE=y

arch/arm/configs/sama5_defconfig

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,20 @@ CONFIG_MEDIA_CONTROLLER=y
164164
CONFIG_VIDEO_V4L2_SUBDEV_API=y
165165
CONFIG_MEDIA_USB_SUPPORT=y
166166
CONFIG_USB_VIDEO_CLASS=m
167+
# CONFIG_USB_GSPCA is not set
167168
CONFIG_V4L_PLATFORM_DRIVERS=y
168-
CONFIG_SOC_CAMERA=y
169-
CONFIG_VIDEO_ATMEL_ISI=y
170169
CONFIG_VIDEO_ATMEL_ISC=y
171-
CONFIG_SOC_CAMERA_OV2640=m
172-
CONFIG_SOC_CAMERA_OV5642=m
173-
CONFIG_SOC_CAMERA_OV6650=m
174-
CONFIG_SOC_CAMERA_OV772X=m
175-
CONFIG_SOC_CAMERA_OV9640=m
176-
CONFIG_SOC_CAMERA_OV9740=m
177-
CONFIG_SOC_CAMERA_OV7740=m
170+
CONFIG_VIDEO_ATMEL_ISI=y
171+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
172+
CONFIG_VIDEO_OV2640=m
173+
CONFIG_VIDEO_OV2659=m
174+
CONFIG_VIDEO_OV7640=m
175+
CONFIG_VIDEO_OV7670=m
176+
CONFIG_VIDEO_OV7740=m
177+
CONFIG_VIDEO_OV9650=m
178+
# CONFIG_DVB_AU8522_V4L is not set
179+
# CONFIG_DVB_TUNER_DIB0070 is not set
180+
# CONFIG_DVB_TUNER_DIB0090 is not set
178181
CONFIG_DRM=y
179182
CONFIG_DRM_ATMEL_HLCDC=y
180183
CONFIG_DRM_PANEL_SIMPLE=y

0 commit comments

Comments
 (0)