tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann b8b10118 7c3ac7c1

+8 -11
+2 -10
arch/arm/configs/imx_v4_v5_defconfig
··· 29 29 CONFIG_IP_MULTICAST=y 30 30 CONFIG_IP_PNP=y 31 31 CONFIG_IP_PNP_DHCP=y 32 - # CONFIG_INET_XFRM_MODE_TRANSPORT is not set 33 - # CONFIG_INET_XFRM_MODE_TUNNEL is not set 34 - # CONFIG_INET_XFRM_MODE_BEET is not set 35 32 # CONFIG_INET_DIAG is not set 36 33 # CONFIG_IPV6 is not set 37 34 CONFIG_NETFILTER=y ··· 55 58 CONFIG_ATA=y 56 59 CONFIG_PATA_IMX=y 57 60 CONFIG_NETDEVICES=y 58 - CONFIG_CS89x0=y 59 61 CONFIG_CS89x0_PLATFORM=y 60 62 CONFIG_DM9000=y 61 63 CONFIG_SMC91X=y 62 - CONFIG_SMC911X=y 63 64 CONFIG_SMSC911X=y 64 65 CONFIG_SMSC_PHY=y 65 66 CONFIG_INPUT_EVDEV=y ··· 73 78 CONFIG_SERIAL_IMX=y 74 79 CONFIG_SERIAL_IMX_CONSOLE=y 75 80 # CONFIG_HW_RANDOM is not set 81 + CONFIG_I2C=y 76 82 CONFIG_I2C_CHARDEV=y 77 83 CONFIG_I2C_IMX=y 78 84 CONFIG_SPI=y ··· 96 100 CONFIG_REGULATOR_MC13783=y 97 101 CONFIG_REGULATOR_MC13892=y 98 102 CONFIG_MEDIA_SUPPORT=y 99 - CONFIG_MEDIA_CAMERA_SUPPORT=y 100 103 CONFIG_V4L_PLATFORM_DRIVERS=y 101 104 CONFIG_V4L_MEM2MEM_DRIVERS=y 102 105 CONFIG_VIDEO_CODA=y 103 106 CONFIG_FB=y 104 107 CONFIG_FB_IMX=y 108 + CONFIG_LCD_CLASS_DEVICE=y 105 109 CONFIG_LCD_L4F00242T03=y 106 110 CONFIG_FRAMEBUFFER_CONSOLE=y 107 111 CONFIG_LOGO=y ··· 111 115 # CONFIG_SND_SPI is not set 112 116 CONFIG_SND_SOC=y 113 117 CONFIG_SND_IMX_SOC=y 114 - CONFIG_SND_SOC_MX27VIS_AIC32X4=y 115 - CONFIG_SND_SOC_PHYCORE_AC97=y 116 118 CONFIG_SND_SOC_EUKREA_TLV320=y 117 - CONFIG_SND_SOC_IMX_MC13783=y 118 119 CONFIG_SND_SOC_FSL_ASOC_CARD=y 119 120 CONFIG_SND_SOC_SGTL5000=y 120 121 CONFIG_USB_HID=m 121 122 CONFIG_USB=y 122 123 CONFIG_USB_EHCI_HCD=y 123 - CONFIG_USB_EHCI_MXC=y 124 124 CONFIG_USB_STORAGE=y 125 125 CONFIG_USB_CHIPIDEA=y 126 126 CONFIG_USB_CHIPIDEA_UDC=y
+2 -1
arch/arm/configs/imx_v6_v7_defconfig
··· 251 251 CONFIG_REGULATOR_DA9062=y 252 252 CONFIG_REGULATOR_DA9063=y 253 253 CONFIG_REGULATOR_GPIO=y 254 + CONFIG_REGULATOR_FP9931=m 254 255 CONFIG_REGULATOR_LTC3676=y 255 256 CONFIG_REGULATOR_MC13783=y 256 257 CONFIG_REGULATOR_MC13892=y ··· 312 311 CONFIG_SND_SOC_EUKREA_TLV320=y 313 312 CONFIG_SND_SOC_IMX_ES8328=y 314 313 CONFIG_SND_SOC_IMX_SGTL5000=y 315 - CONFIG_SND_SOC_FSL_ASOC_CARD=y 314 + CONFIG_SND_SOC_FSL_ASOC_CARD=m 316 315 CONFIG_SND_SOC_AC97_CODEC=y 317 316 CONFIG_SND_SOC_CS42XX8_I2C=y 318 317 CONFIG_SND_SOC_SPDIF=y
+4
arch/arm/configs/multi_v7_defconfig
··· 595 595 CONFIG_MFD_AC100=y 596 596 CONFIG_MFD_AXP20X_I2C=y 597 597 CONFIG_MFD_AXP20X_RSB=y 598 + CONFIG_MFD_DA9052_I2C=y 598 599 CONFIG_MFD_DA9063=m 600 + CONFIG_MFD_MC13XXX_I2C=m 599 601 CONFIG_MFD_MAX14577=y 600 602 CONFIG_MFD_MAX77686=y 601 603 CONFIG_MFD_MAX77693=m ··· 632 630 CONFIG_REGULATOR_AXP20X=y 633 631 CONFIG_REGULATOR_BCM590XX=y 634 632 CONFIG_REGULATOR_CPCAP=y 633 + CONFIG_REGULATOR_DA9052=m 635 634 CONFIG_REGULATOR_DA9210=y 636 635 CONFIG_REGULATOR_FAN53555=y 637 636 CONFIG_REGULATOR_GPIO=y ··· 1039 1036 CONFIG_RTC_DRV_VT8500=y 1040 1037 CONFIG_RTC_DRV_SUNXI=y 1041 1038 CONFIG_RTC_DRV_MV=y 1039 + CONFIG_RTC_DRV_MC13XXX=m 1042 1040 CONFIG_RTC_DRV_PM8XXX=m 1043 1041 CONFIG_RTC_DRV_TEGRA=y 1044 1042 CONFIG_RTC_DRV_ST_LPC=y