tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <olof@lixom.net>

Olof Johansson e40b0695 d6e245ac

+1 -4
+1 -1
arch/arm/configs/sama5_defconfig
··· 150 150 CONFIG_V4L_PLATFORM_DRIVERS=y 151 151 CONFIG_SOC_CAMERA=y 152 152 CONFIG_VIDEO_ATMEL_ISI=y 153 - CONFIG_SOC_CAMERA_OV2640=y 153 + CONFIG_SOC_CAMERA_OV2640=m 154 154 CONFIG_DRM=y 155 155 CONFIG_DRM_ATMEL_HLCDC=y 156 156 CONFIG_DRM_PANEL_SIMPLE=y
-3
arch/arm/mach-at91/Kconfig
··· 21 21 depends on ARCH_MULTI_V7 22 22 select SOC_SAMA5 23 23 select CACHE_L2X0 24 - select HAVE_FB_ATMEL 25 24 select HAVE_AT91_UTMI 26 25 select HAVE_AT91_USB_CLK 27 26 select HAVE_AT91_H32MX ··· 35 36 bool "SAMA5D3 family" 36 37 depends on ARCH_MULTI_V7 37 38 select SOC_SAMA5 38 - select HAVE_FB_ATMEL 39 39 select HAVE_AT91_UTMI 40 40 select HAVE_AT91_SMD 41 41 select HAVE_AT91_USB_CLK ··· 48 50 depends on ARCH_MULTI_V7 49 51 select SOC_SAMA5 50 52 select CACHE_L2X0 51 - select HAVE_FB_ATMEL 52 53 select HAVE_AT91_UTMI 53 54 select HAVE_AT91_SMD 54 55 select HAVE_AT91_USB_CLK