Skip to content

Commit 1e1bf8b

Browse files
committed
Merge tag 'samsung-defconfig-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/defconfig
Samsung SoC defconfig changes for v6.17 1. Multiple SoCs (including Samsung, Apple): switch sound to module from a built-in, because it is not necessary for booting. Also drop redundant sound codec options. 2. Enable PMIC drivers for Google GS101 Pixel 6 phones: MAX77759 and Samsung PMIC over ACPM protocol. * tag 'samsung-defconfig-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: arm64: defconfig: enable Samsung PMIC over ACPM arm64: defconfig: enable Maxim max77759 driver arm64: defconfig: Drop unneeded unselectable sound drivers arm64: defconfig: Switch SOUND to module Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 241a3be + a7d7aeb commit 1e1bf8b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

arch/arm64/configs/defconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -771,11 +771,13 @@ CONFIG_MFD_EXYNOS_LPASS=m
771771
CONFIG_MFD_HI6421_PMIC=y
772772
CONFIG_MFD_HI655X_PMIC=y
773773
CONFIG_MFD_MAX77620=y
774+
CONFIG_MFD_MAX77759=m
774775
CONFIG_MFD_MT6360=y
775776
CONFIG_MFD_MT6397=y
776777
CONFIG_MFD_SPMI_PMIC=y
777778
CONFIG_MFD_RK8XX_I2C=y
778779
CONFIG_MFD_RK8XX_SPI=y
780+
CONFIG_MFD_SEC_ACPM=m
779781
CONFIG_MFD_SEC_I2C=y
780782
CONFIG_MFD_SL28CPLD=y
781783
CONFIG_RZ_MTU3=y
@@ -979,12 +981,12 @@ CONFIG_BACKLIGHT_LP855X=m
979981
CONFIG_LOGO=y
980982
# CONFIG_LOGO_LINUX_MONO is not set
981983
# CONFIG_LOGO_LINUX_VGA16 is not set
982-
CONFIG_SOUND=y
983-
CONFIG_SND=y
984+
CONFIG_SOUND=m
985+
CONFIG_SND=m
984986
CONFIG_SND_ALOOP=m
985987
CONFIG_SND_HDA_TEGRA=m
986988
CONFIG_SND_HDA_CODEC_HDMI=m
987-
CONFIG_SND_SOC=y
989+
CONFIG_SND_SOC=m
988990
CONFIG_SND_BCM2835_SOC_I2S=m
989991
CONFIG_SND_SOC_FSL_ASRC=m
990992
CONFIG_SND_SOC_FSL_MICFIL=m
@@ -1021,12 +1023,12 @@ CONFIG_SND_SOC_ROCKCHIP_SAI=m
10211023
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
10221024
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
10231025
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
1024-
CONFIG_SND_SOC_SAMSUNG=y
10251026
CONFIG_SND_SOC_RCAR=m
10261027
CONFIG_SND_SOC_MSIOF=m
10271028
CONFIG_SND_SOC_RZ=m
1029+
CONFIG_SND_SOC_SAMSUNG=m
10281030
CONFIG_SND_SOC_SOF_TOPLEVEL=y
1029-
CONFIG_SND_SOC_SOF_OF=y
1031+
CONFIG_SND_SOC_SOF_OF=m
10301032
CONFIG_SND_SOC_SOF_MTK_TOPLEVEL=y
10311033
CONFIG_SND_SOC_SOF_MT8186=m
10321034
CONFIG_SND_SOC_SOF_MT8195=m
@@ -1057,7 +1059,6 @@ CONFIG_SND_SOC_DA7213=m
10571059
CONFIG_SND_SOC_ES7134=m
10581060
CONFIG_SND_SOC_ES7241=m
10591061
CONFIG_SND_SOC_ES8316=m
1060-
CONFIG_SND_SOC_ES8328=m
10611062
CONFIG_SND_SOC_ES8328_I2C=m
10621063
CONFIG_SND_SOC_GTM601=m
10631064
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
@@ -1075,7 +1076,6 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
10751076
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
10761077
CONFIG_SND_SOC_WCD9335=m
10771078
CONFIG_SND_SOC_WCD934X=m
1078-
CONFIG_SND_SOC_WCD939X=m
10791079
CONFIG_SND_SOC_WCD939X_SDW=m
10801080
CONFIG_SND_SOC_WM8524=m
10811081
CONFIG_SND_SOC_WM8904=m

0 commit comments

Comments
 (0)