From: Arnd Bergmann Date: Thu, 4 Feb 2021 21:13:25 +0000 (+0100) Subject: Merge tag 'imx-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=39a944cd8b6463d64ca237ffb0b3b0c9f2057d21;p=linux.git Merge tag 'imx-defconfig-5.12' of git://git./linux/kernel/git/shawnguo/linux into arm/defconfig i.MX defconfig change for 5.12: - Enable WM8962 support needed by imx8mn-beacon-kit. - Enable PF8x00 support used by Boundary Nitrogen8M Mini SBC. - Enable a few drivers for Librem 5 devkit support. - Enable interconnect support for i.MX8MQ. - Enable Broadcom BCM54140 PHY driver for Kontron K-Box A-230-LS. - Enable RV3028 I2C RTC and PCA9532 driver support for phyBOARD-Pollux i.MX8MP. - Enable RN5T618 PMIC driver support in imx_v6_v7_defconfig. * tag 'imx-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable PF8x00 as builtin arm64: defconfig: Enable vibra-pwm arm64: defconfig: Enable Broadcom BCM54140 PHY arm64: defconfig: Enable interconnect for imx8mq arm64: defconfig: Enable PCA9532 support arm64: defconfig: Enable rv3028 i2c rtc driver arm64: defconfig: Enable Librem 5 devkit components ARM: imx_v6_v7_defconfig: enable power driver of RN5T618 PMIC family arm64: defconfig: Enable WM8962 Link: https://lore.kernel.org/r/20210204120150.26186-6-shawnguo@kernel.org Signed-off-by: Arnd Bergmann --- 39a944cd8b6463d64ca237ffb0b3b0c9f2057d21 diff --cc arch/arm64/configs/defconfig index 717edd8271a46,f89f3a5f1d7fc..332cae973a044 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -748,18 -748,16 +755,20 @@@ CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD= CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m + CONFIG_SND_SOC_GTM601=m CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_WCD934X=m CONFIG_SND_SOC_WM8904=m + CONFIG_SND_SOC_WM8962=m CONFIG_SND_SOC_WSA881X=m +CONFIG_SND_SOC_LPASS_WSA_MACRO=m +CONFIG_SND_SOC_LPASS_VA_MACRO=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m +CONFIG_HID_MULTITOUCH=m CONFIG_I2C_HID=m CONFIG_USB_CONN_GPIO=m CONFIG_USB=y