diff options
author | Olof Johansson <olof@lixom.net> | 2018-09-25 14:36:39 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-25 14:37:13 -0400 |
commit | 786bd99c91f50482fb9e2b828b203d7e8acc1b56 (patch) | |
tree | 01e2bdab31285347f6ff7857a17115e6ab1ed3fa | |
parent | 0626c46e1ec36930e16ead3143b67d6c78b08011 (diff) | |
parent | 4c736c22d954c81d430558ff62738a35f96f29da (diff) |
Merge tag 'stm32-defconfig-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.20, round 1
In multi_v7_defconfig, add support of:
-STM32 SPI (module)
-STM32 DRM and MIPI DSI (modules)
-Panels OTM8009A and RM68200 (modules)
-Enable backlight gpio
* tag 'stm32-defconfig-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: multi_v7_defconfig: enable backlight gpio
ARM: multi_v7_defconfig: enable panels OTM8009A and RM68200
ARM: multi_v7_defconfig: enable STM32 DRM and MIPI DSI support
ARM: multi_v7_defconfig: enable STM32 SPI
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index fc33444e94f0..f6b88139cbcb 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -391,6 +391,7 @@ CONFIG_SPI_S3C64XX=m | |||
391 | CONFIG_SPI_SH_MSIOF=m | 391 | CONFIG_SPI_SH_MSIOF=m |
392 | CONFIG_SPI_SH_HSPI=y | 392 | CONFIG_SPI_SH_HSPI=y |
393 | CONFIG_SPI_SIRF=y | 393 | CONFIG_SPI_SIRF=y |
394 | CONFIG_SPI_STM32=m | ||
394 | CONFIG_SPI_SUN4I=y | 395 | CONFIG_SPI_SUN4I=y |
395 | CONFIG_SPI_SUN6I=y | 396 | CONFIG_SPI_SUN6I=y |
396 | CONFIG_SPI_TEGRA114=y | 397 | CONFIG_SPI_TEGRA114=y |
@@ -614,6 +615,8 @@ CONFIG_DRM_RCAR_LVDS=y | |||
614 | CONFIG_DRM_SUN4I=m | 615 | CONFIG_DRM_SUN4I=m |
615 | CONFIG_DRM_FSL_DCU=m | 616 | CONFIG_DRM_FSL_DCU=m |
616 | CONFIG_DRM_TEGRA=y | 617 | CONFIG_DRM_TEGRA=y |
618 | CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m | ||
619 | CONFIG_DRM_PANEL_RAYDIUM_RM68200=m | ||
617 | CONFIG_DRM_PANEL_SIMPLE=y | 620 | CONFIG_DRM_PANEL_SIMPLE=y |
618 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=m | 621 | CONFIG_DRM_PANEL_SAMSUNG_LD9040=m |
619 | CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m | 622 | CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m |
@@ -625,6 +628,8 @@ CONFIG_DRM_SII9234=m | |||
625 | CONFIG_DRM_I2C_ADV7511=m | 628 | CONFIG_DRM_I2C_ADV7511=m |
626 | CONFIG_DRM_I2C_ADV7511_AUDIO=y | 629 | CONFIG_DRM_I2C_ADV7511_AUDIO=y |
627 | CONFIG_DRM_STI=m | 630 | CONFIG_DRM_STI=m |
631 | CONFIG_DRM_STM=m | ||
632 | CONFIG_DRM_STM_DSI=m | ||
628 | CONFIG_DRM_VC4=m | 633 | CONFIG_DRM_VC4=m |
629 | CONFIG_DRM_ETNAVIV=m | 634 | CONFIG_DRM_ETNAVIV=m |
630 | CONFIG_DRM_MXSFB=m | 635 | CONFIG_DRM_MXSFB=m |
@@ -636,6 +641,7 @@ CONFIG_FB_SIMPLE=y | |||
636 | CONFIG_LCD_PLATFORM=m | 641 | CONFIG_LCD_PLATFORM=m |
637 | CONFIG_BACKLIGHT_PWM=y | 642 | CONFIG_BACKLIGHT_PWM=y |
638 | CONFIG_BACKLIGHT_AS3711=y | 643 | CONFIG_BACKLIGHT_AS3711=y |
644 | CONFIG_BACKLIGHT_GPIO=y | ||
639 | CONFIG_FRAMEBUFFER_CONSOLE=y | 645 | CONFIG_FRAMEBUFFER_CONSOLE=y |
640 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | 646 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y |
641 | CONFIG_SOUND=m | 647 | CONFIG_SOUND=m |