Commit 017fc151 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-defconfig-5.10' of... 

Merge tag 'imx-defconfig-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig

i.MX defconfig update for 5.10:

- Enable i.MX6SLL, i.MX7ULP SoC and CAAM crypto driver support in
  multi_v7_defconfig.
- Enable the eLCDIF and Raydium RM67191 driver in arm64 defconfig to
  support MIPI DSI on imx8mq-evk.
- Enable NWL DSI host controller, dphy and SITRONIX ST7703 panel driver
  in arm64 defconfig to support display on imx8mq-librem5-devkit.
- Enable sl28cpld board management controller driver support in arm64
  defconfig.
- Enable i.MX8M SoCs support in imx_v6_v7_defconfig as they can run in
  AArch32 mode.

* tag 'imx-defconfig-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable the sl28cpld board management controller
  arm64: defconfig: Enable the eLCDIF and Raydium RM67191 drivers
  arm64: defconfig: Enable imx8mq-librem5-devkit display stack
  arm64: defconfig: re-sync DRM related defconfig bits
  ARM: imx_v6_v7_defconfig: Support i.MX8MN/P/Q
  ARM: multi_v7_defconfig: Enable i.MX7ULP SoC
  ARM: multi_v7_defconfig: Enable i.MX6SLL SoC
  ARM: multi_v7_defconfig: enable caam crypto module

Link: https://lore.kernel.org/r/20200923073009.23678-6-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e3a2e202 c80bcf19

arch/arm/configs/imx_v6_v7_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -218,6 +218,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
@@ -407,6 +410,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

+3 −0
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
@@ -1122,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

arch/arm64/configs/defconfig

+13 −1
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ CONFIG_GPIO_PCA953X=y 
CONFIG_GPIO_PCA953X_IRQ=y

CONFIG_GPIO_BD9571MWV=m

CONFIG_GPIO_MAX77620=y

CONFIG_GPIO_SL28CPLD=m

CONFIG_POWER_AVS=y

CONFIG_QCOM_CPR=y

CONFIG_ROCKCHIP_IODOMAIN=y
@@ -523,6 +524,7 @@ CONFIG_SENSORS_ARM_SCPI=y 
CONFIG_SENSORS_LM90=m

CONFIG_SENSORS_PWM_FAN=m

CONFIG_SENSORS_RASPBERRYPI_HWMON=m

CONFIG_SENSORS_SL28CPLD=m

CONFIG_SENSORS_INA2XX=m

CONFIG_SENSORS_INA3221=m

CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
@@ -545,6 +547,7 @@ CONFIG_QCOM_TSENS=y 
CONFIG_QCOM_SPMI_TEMP_ALARM=m

CONFIG_UNIPHIER_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_SL28CPLD_WATCHDOG=m

CONFIG_ARM_SP805_WATCHDOG=y

CONFIG_ARM_SBSA_WATCHDOG=y

CONFIG_ARM_SMC_WATCHDOG=y
@@ -570,6 +573,7 @@ CONFIG_MFD_MAX77620=y 
CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_RK808=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_SL28CPLD=y

CONFIG_MFD_ROHM_BD718XX=y

CONFIG_MFD_WCD934X=m

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -650,10 +654,13 @@ CONFIG_DRM_MSM=m 
CONFIG_DRM_TEGRA=m

CONFIG_DRM_PANEL_LVDS=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_DRM_SIMPLE_BRIDGE=m

CONFIG_DRM_PANEL_RAYDIUM_RM67191=m

CONFIG_DRM_PANEL_SITRONIX_ST7703=m

CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m

CONFIG_DRM_DISPLAY_CONNECTOR=m

CONFIG_DRM_NWL_MIPI_DSI=m

CONFIG_DRM_SII902X=m

CONFIG_DRM_SIMPLE_BRIDGE=m

CONFIG_DRM_THINE_THC63LVD1024=m

CONFIG_DRM_TI_SN65DSI86=m

CONFIG_DRM_I2C_ADV7511=m
@@ -664,6 +671,7 @@ CONFIG_DRM_VC4=m 
CONFIG_DRM_ETNAVIV=m

CONFIG_DRM_HISI_HIBMC=m

CONFIG_DRM_HISI_KIRIN=m

CONFIG_DRM_MXSFB=m

CONFIG_DRM_MESON=m

CONFIG_DRM_PL111=m

CONFIG_DRM_LIMA=m
@@ -953,14 +961,18 @@ CONFIG_PWM_MESON=m 
CONFIG_PWM_RCAR=m

CONFIG_PWM_ROCKCHIP=y

CONFIG_PWM_SAMSUNG=y

CONFIG_PWM_SL28CPLD=m

CONFIG_PWM_SUN4I=m

CONFIG_PWM_TEGRA=m

CONFIG_SL28CPLD_INTC=y

CONFIG_QCOM_PDC=y

CONFIG_RESET_IMX7=y

CONFIG_RESET_QCOM_AOSS=y

CONFIG_RESET_QCOM_PDC=m

CONFIG_RESET_TI_SCI=y

CONFIG_PHY_XGENE=y

CONFIG_PHY_SUN4I_USB=y

CONFIG_PHY_MIXEL_MIPI_DPHY=m

CONFIG_PHY_HI6220_USB=y

CONFIG_PHY_HISTB_COMBPHY=y

CONFIG_PHY_HISI_INNO_USB2=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE