Skip to content

Commit a1224fd

Browse files
committed
Merge tag 'imx-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.9: - Enable PCA9450 regulator driver in arm64 defconfig. - Enable RV8803 RTC and FSL_SAI audio support in arm64 defconfig to make it useful for Kontron sl28 boards. - Enable i.MX8MM clock and pinctrl driver in imx_v6_v7_defconfig to get AARCH32 mode kernel work on AARCH64 hardware. * tag 'imx-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Support i.MX8MM arm64: defconfig: enable RTC and audio support on Kontron sl28 boards arm64: defconfig: add pca9450 pmic driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a4cd898 + 250ce11 commit a1224fd

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ CONFIG_SPI=y
217217
CONFIG_SPI_GPIO=y
218218
CONFIG_SPI_IMX=y
219219
CONFIG_SPI_FSL_DSPI=y
220+
CONFIG_PINCTRL_IMX8MM=y
220221
CONFIG_GPIO_SYSFS=y
221222
CONFIG_GPIO_SIOX=m
222223
CONFIG_GPIO_MAX732X=y
@@ -406,6 +407,8 @@ CONFIG_STAGING=y
406407
CONFIG_STAGING_MEDIA=y
407408
CONFIG_VIDEO_IMX_MEDIA=y
408409
CONFIG_COMMON_CLK_PWM=y
410+
CONFIG_CLK_IMX8MM=y
411+
CONFIG_SOC_IMX8M=y
409412
CONFIG_IIO=y
410413
CONFIG_MMA8452=y
411414
CONFIG_IMX7D_ADC=y

arch/arm64/configs/defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ CONFIG_REGULATOR_HI6421V530=y
571571
CONFIG_REGULATOR_HI655X=y
572572
CONFIG_REGULATOR_MAX77620=y
573573
CONFIG_REGULATOR_MAX8973=y
574+
CONFIG_REGULATOR_PCA9450=y
574575
CONFIG_REGULATOR_PFUZE100=y
575576
CONFIG_REGULATOR_PWM=y
576577
CONFIG_REGULATOR_QCOM_RPMH=y
@@ -671,6 +672,7 @@ CONFIG_SND_HDA_TEGRA=m
671672
CONFIG_SND_HDA_CODEC_HDMI=m
672673
CONFIG_SND_SOC=y
673674
CONFIG_SND_BCM2835_SOC_I2S=m
675+
CONFIG_SND_SOC_FSL_SAI=m
674676
CONFIG_SND_MESON_AXG_SOUND_CARD=m
675677
CONFIG_SND_MESON_GX_SOUND_CARD=m
676678
CONFIG_SND_SOC_SDM845=m
@@ -688,6 +690,7 @@ CONFIG_SND_SOC_PCM3168A_I2C=m
688690
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
689691
CONFIG_SND_SOC_TAS571X=m
690692
CONFIG_SND_SOC_WCD934X=m
693+
CONFIG_SND_SOC_WM8904=m
691694
CONFIG_SND_SOC_WSA881X=m
692695
CONFIG_SND_SIMPLE_CARD=m
693696
CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -769,6 +772,7 @@ CONFIG_RTC_DRV_MAX77686=y
769772
CONFIG_RTC_DRV_RK808=m
770773
CONFIG_RTC_DRV_PCF85363=m
771774
CONFIG_RTC_DRV_RX8581=m
775+
CONFIG_RTC_DRV_RV8803=m
772776
CONFIG_RTC_DRV_S5M=y
773777
CONFIG_RTC_DRV_DS3232=y
774778
CONFIG_RTC_DRV_PCF2127=m
@@ -817,6 +821,7 @@ CONFIG_CROS_EC_CHARDEV=m
817821
CONFIG_COMMON_CLK_RK808=y
818822
CONFIG_COMMON_CLK_SCPI=y
819823
CONFIG_COMMON_CLK_CS2000_CP=y
824+
CONFIG_COMMON_CLK_FSL_SAI=y
820825
CONFIG_COMMON_CLK_S2MPS11=y
821826
CONFIG_COMMON_CLK_PWM=y
822827
CONFIG_COMMON_CLK_VC5=y

0 commit comments

Comments
 (0)