Skip to content

Commit e40b069

Browse files
committed
Merge tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/late
AT91 defconfig for 5.2 - ov2640 driver as module - selecting HAVE_FB_ATMEL for SAMA5 SoCs is useless * tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: at91: sama5: make ov2640 as a module ARM: at91: remove HAVE_FB_ATMEL for sama5 SoC as they use DRM Signed-off-by: Olof Johansson <[email protected]>
2 parents d6e245a + c60fed1 commit e40b069

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
150150
CONFIG_V4L_PLATFORM_DRIVERS=y
151151
CONFIG_SOC_CAMERA=y
152152
CONFIG_VIDEO_ATMEL_ISI=y
153-
CONFIG_SOC_CAMERA_OV2640=y
153+
CONFIG_SOC_CAMERA_OV2640=m
154154
CONFIG_DRM=y
155155
CONFIG_DRM_ATMEL_HLCDC=y
156156
CONFIG_DRM_PANEL_SIMPLE=y

arch/arm/mach-at91/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ config SOC_SAMA5D2
2121
depends on ARCH_MULTI_V7
2222
select SOC_SAMA5
2323
select CACHE_L2X0
24-
select HAVE_FB_ATMEL
2524
select HAVE_AT91_UTMI
2625
select HAVE_AT91_USB_CLK
2726
select HAVE_AT91_H32MX
@@ -36,7 +35,6 @@ config SOC_SAMA5D3
3635
bool "SAMA5D3 family"
3736
depends on ARCH_MULTI_V7
3837
select SOC_SAMA5
39-
select HAVE_FB_ATMEL
4038
select HAVE_AT91_UTMI
4139
select HAVE_AT91_SMD
4240
select HAVE_AT91_USB_CLK
@@ -50,7 +48,6 @@ config SOC_SAMA5D4
5048
depends on ARCH_MULTI_V7
5149
select SOC_SAMA5
5250
select CACHE_L2X0
53-
select HAVE_FB_ATMEL
5451
select HAVE_AT91_UTMI
5552
select HAVE_AT91_SMD
5653
select HAVE_AT91_USB_CLK

0 commit comments

Comments
 (0)