Skip to content

Commit 68bdc95

Browse files
committed
Merge tag 'imx-defconfig-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig changes for 6.19: - Enable sound drivers for imx28-amarula-rmm in mxs_defconfig - Enable i.MX AIPSTZ driver, i.MX95 pinctrl driver, Ethernet and PCIe support in arm64 defconfig * tag 'imx-defconfig-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: enable i.MX AIPSTZ driver ARM: mxs_defconfig: enable sound drivers for imx28-amarula-rmm arm64: defconfig: Enable i.MX95 drivers for pinctrl, Ethernet and PCIe Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 7462029 + 910ab02 commit 68bdc95

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

arch/arm/configs/mxs_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ CONFIG_SND=y
100100
CONFIG_SND_SOC=y
101101
CONFIG_SND_MXS_SOC=y
102102
CONFIG_SND_SOC_MXS_SGTL5000=y
103+
CONFIG_SND_SOC_TLV320AIC3X_I2C=y
104+
CONFIG_SND_SIMPLE_CARD=y
103105
CONFIG_USB=y
104106
CONFIG_USB_EHCI_HCD=y
105107
CONFIG_USB_STORAGE=y

arch/arm64/configs/defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ CONFIG_GOOGLE_FIRMWARE=y
263263
CONFIG_GOOGLE_CBMEM=m
264264
CONFIG_GOOGLE_COREBOOT_TABLE=m
265265
CONFIG_EFI_CAPSULE_LOADER=y
266+
CONFIG_IMX_AIPSTZ=m
266267
CONFIG_IMX_SCU=y
267268
CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
268269
CONFIG_QCOM_QSEECOM=y
@@ -352,8 +353,10 @@ CONFIG_FSL_FMAN=y
352353
CONFIG_FSL_DPAA_ETH=y
353354
CONFIG_FSL_DPAA2_ETH=y
354355
CONFIG_FSL_ENETC=y
356+
CONFIG_NXP_ENETC4=m
355357
CONFIG_FSL_ENETC_VF=y
356358
CONFIG_FSL_ENETC_QOS=y
359+
CONFIG_NXP_NETC_BLK_CTRL=m
357360
CONFIG_HIX5HD2_GMAC=y
358361
CONFIG_HNS_DSAF=y
359362
CONFIG_HNS_ENET=y
@@ -613,6 +616,7 @@ CONFIG_PINCTRL_IMX8DXL=y
613616
CONFIG_PINCTRL_IMX8ULP=y
614617
CONFIG_PINCTRL_IMX91=y
615618
CONFIG_PINCTRL_IMX93=y
619+
CONFIG_PINCTRL_IMX_SCMI=y
616620
CONFIG_PINCTRL_MSM=y
617621
CONFIG_PINCTRL_IPQ5018=y
618622
CONFIG_PINCTRL_IPQ5332=y
@@ -1351,6 +1355,7 @@ CONFIG_CLK_IMX8MQ=y
13511355
CONFIG_CLK_IMX8QXP=y
13521356
CONFIG_CLK_IMX8ULP=y
13531357
CONFIG_CLK_IMX93=y
1358+
CONFIG_CLK_IMX95_BLK_CTL=y
13541359
CONFIG_TI_SCI_CLK=y
13551360
CONFIG_COMMON_CLK_MT8192_AUDSYS=y
13561361
CONFIG_COMMON_CLK_MT8192_CAMSYS=y

0 commit comments

Comments
 (0)