Commit b0a6cd29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "These are the usual defconfig updates, adding support for additional
  modules and updating some files according to changes in Kconfig.

  I also include the removal of CONFIG_BACKLIGHT_GENERIC across multiple
  architectures, after the driver was removed"

* tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (41 commits)
  powerpc/configs: drop unused BACKLIGHT_GENERIC option
  parisc: configs: drop unused BACKLIGHT_GENERIC option
  arm64: defconfig: drop unused BACKLIGHT_GENERIC option
  ARM: configs: drop unused BACKLIGHT_GENERIC option
  arm64: defconfig: Enable more Librem 5 hardware
  arm64: defconfig: Enable RTC_DRV_HYM8563
  arm64: defconfig: Enable USB_SERIAL_CP210X
  arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
  arm64: defconfig: Enable ROCKCHIP_LVDS
  arm64: defconfig: Enable ARM SCMI protocol and drivers
  ARM: multi_v7_defconfig: Enable ARM SCMI protocol and drivers
  ARM: multi_v7_defconfig: enable STM32 dfsdm audio support
  ARM: multi_v7_defconfig: enable STM32 spdifrx support
  ARM: multi_v7_defconfig: enable STUSB160X Type-C port controller support
  ARM: multi_v7_defconfig: add STM32 crypto support
  ARM: multi_v7_defconfig: enable counter subsystem and stm32 counter drivers
  ARM: multi_v7_defconfig: make Samsung Exynos EHCI driver a module
  arm64: defconfig: Enable Qualcomm PON driver
  ARM: omap2plus_defconfig: Enable TI eQEP counter driver
  ARM: multi_v7_defconfig: ti: Enable networking options for nfs boot
  ...
parents b06db0b3 acf68913

arch/arm/configs/at91_dt_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -124,15 +124,19 @@ CONFIG_MFD_ATMEL_HLCDC=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_SUPPORT_FILTER=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_VIDEO_OV2640=m

CONFIG_VIDEO_MT9V032=m

CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_FB_ATMEL=y

CONFIG_BACKLIGHT_ATMEL_LCDC=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

arch/arm/configs/cm_x300_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ CONFIG_FB=y 
CONFIG_FB_PXA=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_TDO24M=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_DA903X=m

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

arch/arm/configs/colibri_pxa300_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ CONFIG_FB=y 
CONFIG_FB_PXA=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

arch/arm/configs/exynos_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ CONFIG_MD=y 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_NETDEVICES=y

CONFIG_NET_VENDOR_ASIX=y

CONFIG_SPI_AX88796C=y

CONFIG_SMSC911X=y

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=y
@@ -125,7 +127,7 @@ CONFIG_KEYBOARD_CROS_EC=y 
# CONFIG_MOUSE_PS2 is not set

CONFIG_MOUSE_CYAPA=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_MMS114=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MAX77693_HAPTIC=y
@@ -175,6 +177,8 @@ CONFIG_MFD_MAX77693=y 
CONFIG_MFD_MAX8997=y

CONFIG_MFD_MAX8998=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_STMPE=y

CONFIG_STMPE_I2C=y

CONFIG_MFD_TPS65090=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -245,6 +249,7 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=y 
CONFIG_SND_SOC_SNOW=y

CONFIG_SND_SOC_ODROID=y

CONFIG_SND_SOC_ARNDALE=y

CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -319,6 +324,7 @@ CONFIG_EXTCON_MAX77693=y 
CONFIG_EXTCON_MAX8997=y

CONFIG_IIO=y

CONFIG_EXYNOS_ADC=y

CONFIG_STMPE_ADC=y

CONFIG_CM36651=y

CONFIG_AK8975=y

CONFIG_PWM=y

arch/arm/configs/jornada720_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_FB=y 
CONFIG_FB_S1D13XXX=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE