Skip to content

Commit 499a3dd

Browse files
committed
Merge tag 'mtk-defconfig-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/defconfig
MediaTek soc defcofnig updates for v6.14 This enables building modules for the integrated Ethernet controllers (MediaTek STAR and MediaTek DWMAC Glue layer) found on various MediaTek SoCs, and building modules for enabling the sound card on MT8188 and DSP on MT8186. * tag 'mtk-defconfig-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux: arm64: defconfig: Enable MediaTek DWMAC arm64: defconfig: Enable sound for MT8188 arm64: defconfig: Enable MediaTek STAR Ethernet MAC Link: https://lore.kernel.org/r/20250108100826.32458-3-angelogioacchino.delregno@collabora.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents c036b52 + cab3162 commit 499a3dd

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,8 @@ CONFIG_IGBVF=y
359359
CONFIG_MVNETA=y
360360
CONFIG_MVPP2=y
361361
CONFIG_SKY2=y
362+
CONFIG_NET_VENDOR_MEDIATEK=y
363+
CONFIG_NET_MEDIATEK_STAR_EMAC=m
362364
CONFIG_MLX4_EN=m
363365
CONFIG_MLX5_CORE=m
364366
CONFIG_MLX5_CORE_EN=y
@@ -374,6 +376,7 @@ CONFIG_SMSC911X=y
374376
CONFIG_SNI_AVE=y
375377
CONFIG_SNI_NETSEC=y
376378
CONFIG_STMMAC_ETH=m
379+
CONFIG_DWMAC_MEDIATEK=m
377380
CONFIG_DWMAC_TEGRA=m
378381
CONFIG_TI_K3_AM65_CPSW_NUSS=y
379382
CONFIG_TI_ICSSG_PRUETH=m
@@ -968,6 +971,8 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
968971
CONFIG_SND_SOC_MT8183=m
969972
CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
970973
CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
974+
CONFIG_SND_SOC_MT8188=m
975+
CONFIG_SND_SOC_MT8188_MT6359=m
971976
CONFIG_SND_SOC_MT8192=m
972977
CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
973978
CONFIG_SND_SOC_MT8195=m
@@ -996,6 +1001,7 @@ CONFIG_SND_SOC_RZ=m
9961001
CONFIG_SND_SOC_SOF_TOPLEVEL=y
9971002
CONFIG_SND_SOC_SOF_OF=y
9981003
CONFIG_SND_SOC_SOF_MTK_TOPLEVEL=y
1004+
CONFIG_SND_SOC_SOF_MT8186=m
9991005
CONFIG_SND_SOC_SOF_MT8195=m
10001006
CONFIG_SND_SUN8I_CODEC=m
10011007
CONFIG_SND_SUN8I_CODEC_ANALOG=m

0 commit comments

Comments
 (0)