diff options
| author | Olof Johansson <olof@lixom.net> | 2019-05-16 13:59:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-05-16 13:59:33 -0400 |
| commit | e40b0695d56df51ae4d4fe4f60b6c61d123dc7bb (patch) | |
| tree | 5631b4a8eb67b81c5bbe557c0e74c9289d2d5484 | |
| parent | d6e245acc900feeeae021c96d6b33a1c71598373 (diff) | |
| parent | c60fed1dfd4472bc8ac31b20c833c0ef3e049511 (diff) | |
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>
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 515cb37eeab6..d5341b0bd88d 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig | |||
| @@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y | |||
| 150 | CONFIG_V4L_PLATFORM_DRIVERS=y | 150 | CONFIG_V4L_PLATFORM_DRIVERS=y |
| 151 | CONFIG_SOC_CAMERA=y | 151 | CONFIG_SOC_CAMERA=y |
| 152 | CONFIG_VIDEO_ATMEL_ISI=y | 152 | CONFIG_VIDEO_ATMEL_ISI=y |
| 153 | CONFIG_SOC_CAMERA_OV2640=y | 153 | CONFIG_SOC_CAMERA_OV2640=m |
| 154 | CONFIG_DRM=y | 154 | CONFIG_DRM=y |
| 155 | CONFIG_DRM_ATMEL_HLCDC=y | 155 | CONFIG_DRM_ATMEL_HLCDC=y |
| 156 | CONFIG_DRM_PANEL_SIMPLE=y | 156 | CONFIG_DRM_PANEL_SIMPLE=y |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 903f23c309df..01b1bdb4fb6e 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -21,7 +21,6 @@ config SOC_SAMA5D2 | |||
| 21 | depends on ARCH_MULTI_V7 | 21 | depends on ARCH_MULTI_V7 |
| 22 | select SOC_SAMA5 | 22 | select SOC_SAMA5 |
| 23 | select CACHE_L2X0 | 23 | select CACHE_L2X0 |
| 24 | select HAVE_FB_ATMEL | ||
| 25 | select HAVE_AT91_UTMI | 24 | select HAVE_AT91_UTMI |
| 26 | select HAVE_AT91_USB_CLK | 25 | select HAVE_AT91_USB_CLK |
| 27 | select HAVE_AT91_H32MX | 26 | select HAVE_AT91_H32MX |
| @@ -36,7 +35,6 @@ config SOC_SAMA5D3 | |||
| 36 | bool "SAMA5D3 family" | 35 | bool "SAMA5D3 family" |
| 37 | depends on ARCH_MULTI_V7 | 36 | depends on ARCH_MULTI_V7 |
| 38 | select SOC_SAMA5 | 37 | select SOC_SAMA5 |
| 39 | select HAVE_FB_ATMEL | ||
| 40 | select HAVE_AT91_UTMI | 38 | select HAVE_AT91_UTMI |
| 41 | select HAVE_AT91_SMD | 39 | select HAVE_AT91_SMD |
| 42 | select HAVE_AT91_USB_CLK | 40 | select HAVE_AT91_USB_CLK |
| @@ -50,7 +48,6 @@ config SOC_SAMA5D4 | |||
| 50 | depends on ARCH_MULTI_V7 | 48 | depends on ARCH_MULTI_V7 |
| 51 | select SOC_SAMA5 | 49 | select SOC_SAMA5 |
| 52 | select CACHE_L2X0 | 50 | select CACHE_L2X0 |
| 53 | select HAVE_FB_ATMEL | ||
| 54 | select HAVE_AT91_UTMI | 51 | select HAVE_AT91_UTMI |
| 55 | select HAVE_AT91_SMD | 52 | select HAVE_AT91_SMD |
| 56 | select HAVE_AT91_USB_CLK | 53 | select HAVE_AT91_USB_CLK |