Skip to content

Commit 017fc15

Browse files
olofjolofj
committed
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: Olof Johansson <olof@lixom.net>
2 parents e3a2e20 + c80bcf1 commit 017fc15

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎arch/arm/configs/imx_v6_v7_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ CONFIG_SPI_GPIO=y
218218
CONFIG_SPI_IMX=y
219219
CONFIG_SPI_FSL_DSPI=y
220220
CONFIG_PINCTRL_IMX8MM=y
221+
CONFIG_PINCTRL_IMX8MN=y
222+
CONFIG_PINCTRL_IMX8MP=y
223+
CONFIG_PINCTRL_IMX8MQ=y
221224
CONFIG_GPIO_SYSFS=y
222225
CONFIG_GPIO_SIOX=m
223226
CONFIG_GPIO_MAX732X=y
@@ -407,6 +410,9 @@ CONFIG_STAGING_MEDIA=y
407410
CONFIG_VIDEO_IMX_MEDIA=y
408411
CONFIG_COMMON_CLK_PWM=y
409412
CONFIG_CLK_IMX8MM=y
413+
CONFIG_CLK_IMX8MN=y
414+
CONFIG_CLK_IMX8MP=y
415+
CONFIG_CLK_IMX8MQ=y
410416
CONFIG_SOC_IMX8M=y
411417
CONFIG_IIO=y
412418
CONFIG_MMA8452=y

‎arch/arm/configs/multi_v7_defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ CONFIG_SOC_IMX51=y
4343
CONFIG_SOC_IMX53=y
4444
CONFIG_SOC_IMX6Q=y
4545
CONFIG_SOC_IMX6SL=y
46+
CONFIG_SOC_IMX6SLL=y
4647
CONFIG_SOC_IMX6SX=y
4748
CONFIG_SOC_IMX6UL=y
4849
CONFIG_SOC_LS1021A=y
4950
CONFIG_SOC_IMX7D=y
51+
CONFIG_SOC_IMX7ULP=y
5052
CONFIG_SOC_VF610=y
5153
CONFIG_ARCH_KEYSTONE=y
5254
CONFIG_ARCH_MEDIATEK=y
@@ -1122,6 +1124,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
11221124
CONFIG_CRYPTO_USER_API_RNG=m
11231125
CONFIG_CRYPTO_USER_API_AEAD=m
11241126
CONFIG_CRYPTO_DEV_SUN4I_SS=m
1127+
CONFIG_CRYPTO_DEV_FSL_CAAM=m
11251128
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
11261129
CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
11271130
CONFIG_CRYPTO_DEV_S5P=m

‎arch/arm64/configs/defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ CONFIG_GPIO_PCA953X=y
510510
CONFIG_GPIO_PCA953X_IRQ=y
511511
CONFIG_GPIO_BD9571MWV=m
512512
CONFIG_GPIO_MAX77620=y
513+
CONFIG_GPIO_SL28CPLD=m
513514
CONFIG_POWER_AVS=y
514515
CONFIG_QCOM_CPR=y
515516
CONFIG_ROCKCHIP_IODOMAIN=y
@@ -523,6 +524,7 @@ CONFIG_SENSORS_ARM_SCPI=y
523524
CONFIG_SENSORS_LM90=m
524525
CONFIG_SENSORS_PWM_FAN=m
525526
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
527+
CONFIG_SENSORS_SL28CPLD=m
526528
CONFIG_SENSORS_INA2XX=m
527529
CONFIG_SENSORS_INA3221=m
528530
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
@@ -545,6 +547,7 @@ CONFIG_QCOM_TSENS=y
545547
CONFIG_QCOM_SPMI_TEMP_ALARM=m
546548
CONFIG_UNIPHIER_THERMAL=y
547549
CONFIG_WATCHDOG=y
550+
CONFIG_SL28CPLD_WATCHDOG=m
548551
CONFIG_ARM_SP805_WATCHDOG=y
549552
CONFIG_ARM_SBSA_WATCHDOG=y
550553
CONFIG_ARM_SMC_WATCHDOG=y
@@ -570,6 +573,7 @@ CONFIG_MFD_MAX77620=y
570573
CONFIG_MFD_SPMI_PMIC=y
571574
CONFIG_MFD_RK808=y
572575
CONFIG_MFD_SEC_CORE=y
576+
CONFIG_MFD_SL28CPLD=y
573577
CONFIG_MFD_ROHM_BD718XX=y
574578
CONFIG_MFD_WCD934X=m
575579
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -650,10 +654,13 @@ CONFIG_DRM_MSM=m
650654
CONFIG_DRM_TEGRA=m
651655
CONFIG_DRM_PANEL_LVDS=m
652656
CONFIG_DRM_PANEL_SIMPLE=m
653-
CONFIG_DRM_SIMPLE_BRIDGE=m
657+
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
658+
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
654659
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
655660
CONFIG_DRM_DISPLAY_CONNECTOR=m
661+
CONFIG_DRM_NWL_MIPI_DSI=m
656662
CONFIG_DRM_SII902X=m
663+
CONFIG_DRM_SIMPLE_BRIDGE=m
657664
CONFIG_DRM_THINE_THC63LVD1024=m
658665
CONFIG_DRM_TI_SN65DSI86=m
659666
CONFIG_DRM_I2C_ADV7511=m
@@ -664,6 +671,7 @@ CONFIG_DRM_VC4=m
664671
CONFIG_DRM_ETNAVIV=m
665672
CONFIG_DRM_HISI_HIBMC=m
666673
CONFIG_DRM_HISI_KIRIN=m
674+
CONFIG_DRM_MXSFB=m
667675
CONFIG_DRM_MESON=m
668676
CONFIG_DRM_PL111=m
669677
CONFIG_DRM_LIMA=m
@@ -953,14 +961,18 @@ CONFIG_PWM_MESON=m
953961
CONFIG_PWM_RCAR=m
954962
CONFIG_PWM_ROCKCHIP=y
955963
CONFIG_PWM_SAMSUNG=y
964+
CONFIG_PWM_SL28CPLD=m
956965
CONFIG_PWM_SUN4I=m
957966
CONFIG_PWM_TEGRA=m
967+
CONFIG_SL28CPLD_INTC=y
958968
CONFIG_QCOM_PDC=y
969+
CONFIG_RESET_IMX7=y
959970
CONFIG_RESET_QCOM_AOSS=y
960971
CONFIG_RESET_QCOM_PDC=m
961972
CONFIG_RESET_TI_SCI=y
962973
CONFIG_PHY_XGENE=y
963974
CONFIG_PHY_SUN4I_USB=y
975+
CONFIG_PHY_MIXEL_MIPI_DPHY=m
964976
CONFIG_PHY_HI6220_USB=y
965977
CONFIG_PHY_HISTB_COMBPHY=y
966978
CONFIG_PHY_HISI_INNO_USB2=y

0 commit comments

Comments
 (0)