Skip to content

Commit 1758da7

Browse files
committed
Merge tag 'imx-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.19: - Enable the WM8524 codec driver as module in arm64 defconfig for audio support on imx8mn-evk board. - Enable the ADC part of the STMPE MFD in imx_v6_v7_defconfig, as the SoM Apalis/Colibri iMX6 use the ADC of a STMPE 811. * tag 'imx-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable the WM8524 codec driver ARM: imx_v6_v7_defconfig: Enable the ADC part of the STMPE MFD Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9bc4df1 + 080d681 commit 1758da7

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ CONFIG_IIO=y
402402
CONFIG_MMA8452=y
403403
CONFIG_IMX7D_ADC=y
404404
CONFIG_RN5T618_ADC=y
405+
CONFIG_STMPE_ADC=y
405406
CONFIG_VF610_ADC=y
406407
CONFIG_SENSORS_ISL29018=y
407408
CONFIG_MAG3110=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
819819
CONFIG_SND_SOC_TAS571X=m
820820
CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
821821
CONFIG_SND_SOC_WCD934X=m
822+
CONFIG_SND_SOC_WM8524=m
822823
CONFIG_SND_SOC_WM8904=m
823824
CONFIG_SND_SOC_WM8960=m
824825
CONFIG_SND_SOC_WM8962=m

0 commit comments

Comments
 (0)