Commit 45fe6058 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep this in a separate branch to avoid cross-branch conflicts, but
  most of the material here is fairly boring -- some new drivers turned
  on for hardware since they were merged, and some refreshed files due
  to time having moved a lot of entries around"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (33 commits)
  ARM: multi_v7_defconfig: add FMC2 EBI controller support
  arm64: defconfig: enable Qualcomm ASoC modules
  arm64: defconfig: qcom: enable GPU clock controller for SM8[12]50
  arm64: defconfig: enable INTERCONNECT for Qualcomm chipsets
  arm64: defconfig: enable the sl28cpld board management controller
  arm64: defconfig: Enable the eLCDIF and Raydium RM67191 drivers
  arm64: defconfig: Enable Qcom SNPS Femto PHY
  ARM: configs: Update Realview defconfig
  ARM: configs: Update Versatile defconfig
  ARM: config: aspeed_g5: Enable IBM OP Panel driver
  ARM: config: aspeed-g5: Enable I2C GPIO mux driver
  ARM: config: aspeed: Fix selection of media drivers
  arm64: defconfig: Enable Samsung S3FWRN5 NFC driver
  ARM: omap2plus_defconfig: enable generic net options
  ARM: omap2plus_defconfig: enable twl4030_madc as a loadable module
  arm64: defconfig: Enable clock driver for ROHM BD718x7 PMIC
  arm64: defconfig: Build ADMA and ACONNECT driver
  arm64: defconfig: Build AHUB component drivers
  arm64: defconfig: Enable Lontium LT9611 driver
  arm64: defcondfig: Enable USB ACM and FTDI drivers
  ...
parents e533cda1 4550e2c8

arch/arm/configs/aspeed_g4_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ CONFIG_SENSORS_TMP421=y 
CONFIG_SENSORS_W83773G=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_SUPPORT_FILTER=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ASPEED=y

CONFIG_DRM=y

arch/arm/configs/aspeed_g5_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_GPIO_POLLED=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_IBM_PANEL=y

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set
@@ -147,10 +149,12 @@ CONFIG_HW_RANDOM_TIMERIOMEM=y 
# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_GPIO=y

CONFIG_I2C_MUX_PCA9541=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y

CONFIG_I2C_FSI=y

CONFIG_I2C_SLAVE=y

CONFIG_SPI=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y
@@ -175,7 +179,8 @@ CONFIG_SENSORS_TMP421=y 
CONFIG_SENSORS_W83773G=y

CONFIG_WATCHDOG_SYSFS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_SUPPORT_FILTER=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ASPEED=y

CONFIG_DRM=y

arch/arm/configs/exynos_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -191,11 +191,14 @@ CONFIG_REGULATOR_S2MPS11=y 
CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS65090=y

CONFIG_REGULATOR_WM8994=y

CONFIG_MEDIA_CEC_SUPPORT=y

CONFIG_CEC_SAMSUNG_S5P=m

CONFIG_MEDIA_SUPPORT=m

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CEC_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_MEDIA_PLATFORM_SUPPORT=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -210,9 +213,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m 
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_VIDEO_VIVID=m

CONFIG_CEC_PLATFORM_DRIVERS=y

CONFIG_CEC_SAMSUNG_S5P=m

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_S5K6A3=m

CONFIG_VIDEO_S5C73M3=m

CONFIG_DRM=y

arch/arm/configs/imx_v6_v7_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ CONFIG_SPI_GPIO=y 
CONFIG_SPI_IMX=y

CONFIG_SPI_FSL_DSPI=y

CONFIG_PINCTRL_IMX8MM=y

CONFIG_PINCTRL_IMX8MN=y

CONFIG_PINCTRL_IMX8MP=y

CONFIG_PINCTRL_IMX8MQ=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SIOX=m

CONFIG_GPIO_MAX732X=y
@@ -395,6 +398,9 @@ CONFIG_STAGING_MEDIA=y 
CONFIG_VIDEO_IMX_MEDIA=y

CONFIG_COMMON_CLK_PWM=y

CONFIG_CLK_IMX8MM=y

CONFIG_CLK_IMX8MN=y

CONFIG_CLK_IMX8MP=y

CONFIG_CLK_IMX8MQ=y

CONFIG_SOC_IMX8M=y

CONFIG_IIO=y

CONFIG_MMA8452=y

arch/arm/configs/multi_v7_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -43,10 +43,12 @@ CONFIG_SOC_IMX51=y 
CONFIG_SOC_IMX53=y

CONFIG_SOC_IMX6Q=y

CONFIG_SOC_IMX6SL=y

CONFIG_SOC_IMX6SLL=y

CONFIG_SOC_IMX6SX=y

CONFIG_SOC_IMX6UL=y

CONFIG_SOC_LS1021A=y

CONFIG_SOC_IMX7D=y

CONFIG_SOC_IMX7ULP=y

CONFIG_SOC_VF610=y

CONFIG_ARCH_KEYSTONE=y

CONFIG_ARCH_MEDIATEK=y
@@ -182,7 +184,7 @@ CONFIG_PCIEPORTBUS=y 
CONFIG_PCI_MVEBU=y

CONFIG_PCI_TEGRA=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCIE_RCAR=y

CONFIG_PCIE_RCAR_HOST=y

CONFIG_PCI_DRA7XX_EP=y

CONFIG_PCI_ENDPOINT=y

CONFIG_PCI_ENDPOINT_CONFIGFS=y
@@ -1011,6 +1013,7 @@ CONFIG_EXTCON_MAX14577=m 
CONFIG_EXTCON_MAX77693=m

CONFIG_EXTCON_MAX8997=m

CONFIG_TI_AEMIF=y

CONFIG_STM32_FMC2_EBI=y

CONFIG_EXYNOS5422_DMC=m

CONFIG_IIO=y

CONFIG_IIO_SW_TRIGGER=y
@@ -1121,6 +1124,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_DEV_SUN4I_SS=m

CONFIG_CRYPTO_DEV_FSL_CAAM=m

CONFIG_CRYPTO_DEV_MARVELL_CESA=m

CONFIG_CRYPTO_DEV_EXYNOS_RNG=m

CONFIG_CRYPTO_DEV_S5P=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE