Unverified Commit b8b10118 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-defconfig-6.20' of... 

Merge tag 'imx-defconfig-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig

i.MX defconfig changes for 6.20:

- A couple of changes from Alexander Stein and Andreas Kemnade to enable
  SND_SOC_FSL_ASOC_CARD and REGULATOR_FP9931 in imx_v6_v7_defconfig
- A change from Dmitry Baryshkov to enable DA9052 and MC13XXX in
  multi_v7_defconfig
- A change from Josua Mayer to refresh imx_v4_v5_defconfig by removing
  stale options and adding missing ones

* tag 'imx-defconfig-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx_v4_v5_defconfig: update for v6.19-rc1
  ARM: imx_v6_v7_defconfig: enable EPD regulator needed for Kobo Clara 2e
  ARM: imx_v6_v7_defconfig: Configure CONFIG_SND_SOC_FSL_ASOC_CARD as module
  ARM: multi_v7_defconfig: enable DA9052 and MC13XXX

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7c3ac7c1 42832d01

arch/arm/configs/imx_v4_v5_defconfig

+2 −10
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y
@@ -58,11 +55,9 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

CONFIG_CS89x0=y

CONFIG_CS89x0_PLATFORM=y

CONFIG_DM9000=y

CONFIG_SMC91X=y

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

CONFIG_SMSC_PHY=y

CONFIG_INPUT_EVDEV=y
@@ -78,6 +73,7 @@ CONFIG_SERIAL_8250=m 
CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y
@@ -100,12 +96,12 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_CODA=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y
@@ -115,16 +111,12 @@ CONFIG_SND=y 
# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_SOC_MX27VIS_AIC32X4=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_SGTL5000=y

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

arch/arm/configs/imx_v6_v7_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y 
CONFIG_REGULATOR_DA9062=y

CONFIG_REGULATOR_DA9063=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_FP9931=m

CONFIG_REGULATOR_LTC3676=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y
@@ -311,7 +312,7 @@ CONFIG_SND_IMX_SOC=y 
CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_ES8328=y

CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_FSL_ASOC_CARD=m

CONFIG_SND_SOC_AC97_CODEC=y

CONFIG_SND_SOC_CS42XX8_I2C=y

CONFIG_SND_SOC_SPDIF=y

arch/arm/configs/multi_v7_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -595,7 +595,9 @@ CONFIG_MFD_BCM590XX=y 
CONFIG_MFD_AC100=y

CONFIG_MFD_AXP20X_I2C=y

CONFIG_MFD_AXP20X_RSB=y

CONFIG_MFD_DA9052_I2C=y

CONFIG_MFD_DA9063=m

CONFIG_MFD_MC13XXX_I2C=m

CONFIG_MFD_MAX14577=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX77693=m
@@ -630,6 +632,7 @@ CONFIG_REGULATOR_AS3722=y 
CONFIG_REGULATOR_AXP20X=y

CONFIG_REGULATOR_BCM590XX=y

CONFIG_REGULATOR_CPCAP=y

CONFIG_REGULATOR_DA9052=m

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_FAN53555=y

CONFIG_REGULATOR_GPIO=y
@@ -1036,6 +1039,7 @@ CONFIG_RTC_DRV_RZN1=m 
CONFIG_RTC_DRV_VT8500=y

CONFIG_RTC_DRV_SUNXI=y

CONFIG_RTC_DRV_MV=y

CONFIG_RTC_DRV_MC13XXX=m

CONFIG_RTC_DRV_PM8XXX=m

CONFIG_RTC_DRV_TEGRA=y

CONFIG_RTC_DRV_ST_LPC=y