Commit e40b0695 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'at91-5.2-defconfig' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents d6e245ac c60fed1d
...@@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y ...@@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA=y
CONFIG_VIDEO_ATMEL_ISI=y CONFIG_VIDEO_ATMEL_ISI=y
CONFIG_SOC_CAMERA_OV2640=y CONFIG_SOC_CAMERA_OV2640=m
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_ATMEL_HLCDC=y CONFIG_DRM_ATMEL_HLCDC=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
......
...@@ -21,7 +21,6 @@ config SOC_SAMA5D2 ...@@ -21,7 +21,6 @@ config SOC_SAMA5D2
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select SOC_SAMA5 select SOC_SAMA5
select CACHE_L2X0 select CACHE_L2X0
select HAVE_FB_ATMEL
select HAVE_AT91_UTMI select HAVE_AT91_UTMI
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
select HAVE_AT91_H32MX select HAVE_AT91_H32MX
...@@ -36,7 +35,6 @@ config SOC_SAMA5D3 ...@@ -36,7 +35,6 @@ config SOC_SAMA5D3
bool "SAMA5D3 family" bool "SAMA5D3 family"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select SOC_SAMA5 select SOC_SAMA5
select HAVE_FB_ATMEL
select HAVE_AT91_UTMI select HAVE_AT91_UTMI
select HAVE_AT91_SMD select HAVE_AT91_SMD
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
...@@ -50,7 +48,6 @@ config SOC_SAMA5D4 ...@@ -50,7 +48,6 @@ config SOC_SAMA5D4
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select SOC_SAMA5 select SOC_SAMA5
select CACHE_L2X0 select CACHE_L2X0
select HAVE_FB_ATMEL
select HAVE_AT91_UTMI select HAVE_AT91_UTMI
select HAVE_AT91_SMD select HAVE_AT91_SMD
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment