| Message ID | 20210608103833.598348-1-joel@jms.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: config: Refresh mutli v7 | expand |
On Tue, Jun 8, 2021 at 12:38 PM Joel Stanley <joel@jms.id.au> wrote: > > This regenerates the v7 defconfig, with some new options added to ensure > drivers that were enabled in previous releases are once again enabled. > > This was generated atop next-20210607. Thank you for going through this and updating all the settings. If you still have energy after writing up the long changelog, can I ask you to split it up into separate changes for options that are no longer available (sirf, efi_vars, ...), options that got moved within the file and those that need some other change? > SPI_AX88796C was enabled in v5.11 for Exynos boards, but the driver is > not yet merged. There's still some work being doing to merge this > driver, so leave it alone for now. Makes sense > MICREL_PHY is selected by the ks8851 ethernet driver as of f0791b92d2b6 ("net: > ks8851: Select PHYLIB and MICREL_PHY in Kconfig"). > > SMSC_PHY is selected by USB_NET_SMSC95XX as of commit 05b35e7eb9a1 ("smsc95xx: > add phylib support"). > > PTP_1588_CLOCK is unknown. SOmething ot do with FEC or STMMAC_ETH? No idea, in my copy of linux-next it still exists. There are a couple of drivers that use 'imply PTP_1588_CLOCK', but that is something we should probably change, as 'imply' usually doesn't do what was intended. Yes, I realize that PTP_1588_CLOCK was the original motivation for introducing 'imply'... > The MSM pinctrl drivers fell out of the defconfig as of commit be117ca32261 > ("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a > selected config"). Add PINCTRL_MSM so these stay enabled. Good catch > POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d62054 ("PM: AVS: > smartreflex Move driver to soc specific drivers"). Add the new symbol. > > STMPE_I2C is default y. It was explicitly added to the defconfig in commit > d8f0ddc83877 ("ARM: defconfig: add STMPE ADC driver for P4 Note") but it's not > required. I suppose it shouldn't really use 'default y', but removing it here is easier, it's been this way for ten years now. > VIVID needs FB=y, which became disabled at some point, so enable it. > This also ensure the FB_EFI and other drivers stay enabled. There should probably be a separate effort to remove dependencies on CONFIG_FB and leave it turned off in defconfig. Hans, do you know the hard dependency in vivid can be avoided or if this is inherent to how the driver works? I had previously tried to decouple DRM from FB, so I'm happy that Kees' patch made it into linux-next. > CLK_ACTIONS and CLK_OWL_S500 was explicitly added in commit 26ba4a474aec ("ARM: > multi_v7_defconfig: Enable Actions Semi platform and drivers"), but it defaults > on when ARCH_ACTIONS is enabled. Drop them. > > QCOM_PM became ARM_QCOM_SPM_CPUIDLE in commit a871be6b8eee ("cpuidle: Convert > Qualcomm SPM driver to a generic CPUidle driver"). > > SND_MMP_SOC became CONFIG_SND_MMP_SOC_SSPA in commit a97e384ba78f ("ASoC: > mmp-sspa: Add Device Tree support"). Enable that instead. > > MFD_CROS_EC_DEV defualts on when CROS_EC is enabled. > > TEGRA20_APB_DMA is selected by SOC_TEGRA_FUSE if ARCH_TEGRA_2x_SOC since commit > 19d41e5e9c68 ("soc/tegra: fuse: Add APB DMA dependency for Tegra20"). > > USB_CHIPIDEA_TEGRA is enabled when USB_CHIPIDEA is enabled. It falls out > of the defconfig but is enabled, as intended by d50229cee69b ("ARM: > multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA"). These all look good. > EDAC depends on RAS, so enable it to ensure the EDAC drivers stay > enabled. > > SND_CTL_LED selects LEDS_TRIGGERS and NEW_LEDS so they fall out of the > defconfig. Please skip this last change, I think we should change the Kconfig logic instead here, so SND_CTL_LED doesn't force-enable the subsystem. Arnd
On 08/06/2021 18:14, Arnd Bergmann wrote: > On Tue, Jun 8, 2021 at 12:38 PM Joel Stanley <joel@jms.id.au> wrote: >> >> This regenerates the v7 defconfig, with some new options added to ensure >> drivers that were enabled in previous releases are once again enabled. >> >> This was generated atop next-20210607. > > Thank you for going through this and updating all the settings. If you > still have > energy after writing up the long changelog, can I ask you to split it up into > separate changes for options that are no longer available (sirf, efi_vars, ...), > options that got moved within the file and those that need some other change? > >> SPI_AX88796C was enabled in v5.11 for Exynos boards, but the driver is >> not yet merged. There's still some work being doing to merge this >> driver, so leave it alone for now. > > Makes sense > >> MICREL_PHY is selected by the ks8851 ethernet driver as of f0791b92d2b6 ("net: >> ks8851: Select PHYLIB and MICREL_PHY in Kconfig"). >> >> SMSC_PHY is selected by USB_NET_SMSC95XX as of commit 05b35e7eb9a1 ("smsc95xx: >> add phylib support"). >> >> PTP_1588_CLOCK is unknown. SOmething ot do with FEC or STMMAC_ETH? > > No idea, in my copy of linux-next it still exists. There are a couple of drivers > that use 'imply PTP_1588_CLOCK', but that is something we should probably > change, as 'imply' usually doesn't do what was intended. Yes, I realize that > PTP_1588_CLOCK was the original motivation for introducing 'imply'... > >> The MSM pinctrl drivers fell out of the defconfig as of commit be117ca32261 >> ("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a >> selected config"). Add PINCTRL_MSM so these stay enabled. > > Good catch > >> POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d62054 ("PM: AVS: >> smartreflex Move driver to soc specific drivers"). Add the new symbol. >> >> STMPE_I2C is default y. It was explicitly added to the defconfig in commit >> d8f0ddc83877 ("ARM: defconfig: add STMPE ADC driver for P4 Note") but it's not >> required. > > I suppose it shouldn't really use 'default y', but removing it here is > easier, it's > been this way for ten years now. > >> VIVID needs FB=y, which became disabled at some point, so enable it. >> This also ensure the FB_EFI and other drivers stay enabled. > > There should probably be a separate effort to remove dependencies on > CONFIG_FB and leave it turned off in defconfig. Hans, do you know the > hard dependency in vivid can be avoided or if this is inherent to how the driver > works? Right now it is inherent to the driver. It is probably possible to drop support for video overlay devices if CONFIG_FB=n, but it is not something I have time for. It's just a test driver (albeit a very useful test driver), so it is no big deal if it is disabled when CONFIG_FB=n. Regards, Hans > > I had previously tried to decouple DRM from FB, so I'm happy that Kees' patch > made it into linux-next. > >> CLK_ACTIONS and CLK_OWL_S500 was explicitly added in commit 26ba4a474aec ("ARM: >> multi_v7_defconfig: Enable Actions Semi platform and drivers"), but it defaults >> on when ARCH_ACTIONS is enabled. Drop them. >> >> QCOM_PM became ARM_QCOM_SPM_CPUIDLE in commit a871be6b8eee ("cpuidle: Convert >> Qualcomm SPM driver to a generic CPUidle driver"). >> >> SND_MMP_SOC became CONFIG_SND_MMP_SOC_SSPA in commit a97e384ba78f ("ASoC: >> mmp-sspa: Add Device Tree support"). Enable that instead. >> >> MFD_CROS_EC_DEV defualts on when CROS_EC is enabled. >> >> TEGRA20_APB_DMA is selected by SOC_TEGRA_FUSE if ARCH_TEGRA_2x_SOC since commit >> 19d41e5e9c68 ("soc/tegra: fuse: Add APB DMA dependency for Tegra20"). >> >> USB_CHIPIDEA_TEGRA is enabled when USB_CHIPIDEA is enabled. It falls out >> of the defconfig but is enabled, as intended by d50229cee69b ("ARM: >> multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA"). > > These all look good. > >> EDAC depends on RAS, so enable it to ensure the EDAC drivers stay >> enabled. >> >> SND_CTL_LED selects LEDS_TRIGGERS and NEW_LEDS so they fall out of the >> defconfig. > > Please skip this last change, I think we should change the Kconfig > logic instead here, > so SND_CTL_LED doesn't force-enable the subsystem. > > Arnd >
On Tue, Jun 8, 2021 at 6:49 PM Hans Verkuil <hverkuil@xs4all.nl> wrote: > On 08/06/2021 18:14, Arnd Bergmann wrote: > > Right now it is inherent to the driver. It is probably possible to drop support > for video overlay devices if CONFIG_FB=n, but it is not something I have time > for. It's just a test driver (albeit a very useful test driver), so it is no > big deal if it is disabled when CONFIG_FB=n. Ok, thanks for the reply, makes sense. I checked what other consequences there are if we disable CONFIG_FB and CONFIG_DRM_KMS_FB_HELPER=y in all the defconfigs now, as the patch from Kees did. It appears that the only other arm32 framebuffers that remain are FB_EFI=y, FB_WM8505=y, FB_MX3=m and FB_SIMPLE=y. On arm64, losing CONFIG_FB=y would disable FB_EFI=y, XEN_FBDEV_FRONTEND=y, and FB_MX3=m On x86, it's only CONFIG_FB_EFI It appears that FB_MX3 is orphaned since commit e1324ece2af4 ("ARM: imx: Remove i.MX35 board files") because all Armv6 or newer i.MX now use drivers/gpu/drm/mxsfb/mxsfb_drv.c, and FB_WM8505 is probably unused as well (we discussed removing the platform last winter, but decided to give it another year to see if new users come up, which has not happened). As long as simplefb, efifb and xenfb are needed though, we probably want CONFIG_FB=y anyway and leaving VIVID=m with the dependency does not cause problems until those are all turned into drm drivers. Arnd
On Wed, 9 Jun 2021 at 09:30, Arnd Bergmann <arnd@arndb.de> wrote: > > On Tue, Jun 8, 2021 at 6:49 PM Hans Verkuil <hverkuil@xs4all.nl> wrote: > > On 08/06/2021 18:14, Arnd Bergmann wrote: > > > > Right now it is inherent to the driver. It is probably possible to drop support > > for video overlay devices if CONFIG_FB=n, but it is not something I have time > > for. It's just a test driver (albeit a very useful test driver), so it is no > > big deal if it is disabled when CONFIG_FB=n. > > Ok, thanks for the reply, makes sense. > > I checked what other consequences there are if we disable CONFIG_FB > and CONFIG_DRM_KMS_FB_HELPER=y in all the defconfigs now, > as the patch from Kees did. > > It appears that the only other arm32 framebuffers that remain are > FB_EFI=y, FB_WM8505=y, FB_MX3=m and FB_SIMPLE=y. FB_SH_MOBILE_LCDC on arm32 too. > As long as simplefb, efifb and xenfb are needed though, we probably > want CONFIG_FB=y anyway and leaving VIVID=m with the dependency > does not cause problems until those are all turned into drm drivers. I will go ahead with this for the v7 defconfig. Cheers, Joel
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 52a0400fdd92..fb560f12b878 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -72,7 +72,6 @@ CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y -CONFIG_ARCH_SIRF=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y @@ -96,7 +95,6 @@ CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y CONFIG_SMP=y CONFIG_NR_CPUS=16 -CONFIG_SECCOMP=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_KEXEC=y @@ -110,21 +108,21 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y -CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_ARM_RASPBERRYPI_CPUFREQ=y +CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y CONFIG_ARM_TEGRA_CPUIDLE=y +CONFIG_ARM_QCOM_SPM_CPUIDLE=y CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_SPROM=y -CONFIG_EFI_VARS=m CONFIG_EFI_CAPSULE_LOADER=m CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=m @@ -157,7 +155,6 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_DSA=m CONFIG_CAN=y CONFIG_CAN_AT91=m @@ -196,7 +193,6 @@ CONFIG_PCI_EPF_TEST=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_OMAP_OCP2SCP=y -CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y @@ -280,12 +276,10 @@ CONFIG_TI_CPTS=y CONFIG_XILINX_EMACLITE=y CONFIG_BROADCOM_PHY=y CONFIG_ICPLUS_PHY=y -CONFIG_DP83867_PHY=y CONFIG_MARVELL_PHY=y -CONFIG_MICREL_PHY=y CONFIG_AT803X_PHY=y CONFIG_ROCKCHIP_PHY=y -CONFIG_SMSC_PHY=y +CONFIG_DP83867_PHY=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8152=m CONFIG_USB_LAN78XX=m @@ -352,8 +346,6 @@ CONFIG_SERIAL_MESON=y CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_SERIAL_SIRFSOC=y -CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -378,7 +370,6 @@ CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_SERIAL_STM32=y CONFIG_SERIAL_STM32_CONSOLE=y CONFIG_SERIAL_OWL=y -CONFIG_SERIAL_OWL_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_VIRTIO_CONSOLE=y CONFIG_ASPEED_KCS_IPMI_BMC=m @@ -408,7 +399,6 @@ CONFIG_I2C_RIIC=y CONFIG_I2C_RK3X=y CONFIG_I2C_S3C2410=y CONFIG_I2C_SH_MOBILE=y -CONFIG_I2C_SIRF=y CONFIG_I2C_ST=y CONFIG_I2C_STM32F7=y CONFIG_I2C_SUN6I_P2WI=y @@ -436,7 +426,6 @@ CONFIG_SPI_RSPI=y CONFIG_SPI_S3C64XX=m CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=y -CONFIG_SPI_SIRF=y CONFIG_SPI_STM32=m CONFIG_SPI_STM32_QSPI=y CONFIG_SPI_SUN4I=y @@ -447,13 +436,12 @@ CONFIG_SPI_TEGRA20_SLINK=y CONFIG_SPI_XILINX=y CONFIG_SPI_SPIDEV=y CONFIG_SPMI=y -CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_AS3722=y -CONFIG_PINCTRL_RZA2=y CONFIG_PINCTRL_STMFX=y CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_OWL=y CONFIG_PINCTRL_S500=y +CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_APQ8064=y CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y @@ -463,10 +451,12 @@ CONFIG_PINCTRL_MSM8X74=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SSBI_PMIC=y +CONFIG_PINCTRL_RZA2=y CONFIG_GPIO_ASPEED_SGPIO=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_EM=y +CONFIG_GPIO_MXC=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_SYSCON=y CONFIG_GPIO_UNIPHIER=y @@ -479,9 +469,6 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y -CONFIG_GPIO_MXC=y -CONFIG_POWER_AVS=y -CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y @@ -520,9 +507,9 @@ CONFIG_ARMADA_THERMAL=y CONFIG_BCM2711_THERMAL=m CONFIG_BCM2835_THERMAL=m CONFIG_BRCMSTB_THERMAL=m -CONFIG_GENERIC_ADC_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=y CONFIG_TEGRA_SOCTHERM=m +CONFIG_GENERIC_ADC_THERMAL=m CONFIG_UNIPHIER_THERMAL=y CONFIG_DA9063_WATCHDOG=m CONFIG_XILINX_WATCHDOG=y @@ -574,7 +561,6 @@ CONFIG_MFD_RK808=y CONFIG_MFD_RN5T618=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_STMPE=y -CONFIG_STMPE_I2C=y CONFIG_MFD_PALMAS=y CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=y @@ -630,11 +616,9 @@ CONFIG_REGULATOR_TPS65910=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_REGULATOR_WM8994=m +CONFIG_CEC_SAMSUNG_S5P=m +CONFIG_CEC_STM32=m CONFIG_MEDIA_SUPPORT=m -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y @@ -661,9 +645,6 @@ CONFIG_VIDEO_RENESAS_JPU=m CONFIG_VIDEO_RENESAS_VSP1=m CONFIG_V4L_TEST_DRIVERS=y CONFIG_VIDEO_VIVID=m -CONFIG_CEC_PLATFORM_DRIVERS=y -CONFIG_CEC_SAMSUNG_S5P=m -CONFIG_CEC_STM32=m CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ADV7604=m CONFIG_VIDEO_ADV7604_CEC=y @@ -684,11 +665,6 @@ CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y -CONFIG_DRM_IMX=m -CONFIG_DRM_IMX_PARALLEL_DISPLAY=m -CONFIG_DRM_IMX_TVE=m -CONFIG_DRM_IMX_LDB=m -CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_RCAR_DU=m CONFIG_DRM_RCAR_LVDS=y @@ -698,7 +674,7 @@ CONFIG_DRM_FSL_DCU=m CONFIG_DRM_TEGRA=y CONFIG_DRM_STM=m CONFIG_DRM_STM_DSI=m -CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_SAMSUNG_LD9040=m CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m CONFIG_DRM_PANEL_RAYDIUM_RM68200=m @@ -713,6 +689,11 @@ CONFIG_DRM_TOSHIBA_TC358764=m CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_STI=m +CONFIG_DRM_IMX=m +CONFIG_DRM_IMX_PARALLEL_DISPLAY=m +CONFIG_DRM_IMX_TVE=m +CONFIG_DRM_IMX_LDB=m +CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m @@ -720,13 +701,14 @@ CONFIG_DRM_PL111=m CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m CONFIG_DRM_ASPEED_GFX=m +CONFIG_FB=y CONFIG_FB_EFI=y CONFIG_FB_WM8505=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FB_SIMPLE=y -CONFIG_BACKLIGHT_PWM=y -CONFIG_BACKLIGHT_AS3711=y -CONFIG_BACKLIGHT_GPIO=y +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_AS3711=m +CONFIG_BACKLIGHT_GPIO=m CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_SOUND=m @@ -744,8 +726,8 @@ CONFIG_SND_ATMEL_SOC_PDMIC=m CONFIG_SND_ATMEL_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_SOC_FSL_SAI=m -CONFIG_SND_MMP_SOC=y CONFIG_SND_PXA_SOC_SSP=m +CONFIG_SND_MMP_SOC_SSPA=m CONFIG_SND_PXA910_SOC=m CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m @@ -780,7 +762,6 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_CPCAP=m CONFIG_SND_SOC_CS42L51_I2C=m CONFIG_SND_SOC_SGTL5000=m -CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_STI_SAS=m CONFIG_SND_SOC_WM8978=m CONFIG_SND_AUDIO_GRAPH_CARD=m @@ -816,7 +797,6 @@ CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_TEGRA=y CONFIG_USB_ISP1760=y CONFIG_USB_HSIC_USB3503=y CONFIG_AB8500_USB=y @@ -828,7 +808,6 @@ CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_FSL_USB2=y CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_ASPEED_VHUB=m CONFIG_USB_CONFIGFS=m @@ -887,7 +866,6 @@ CONFIG_MMC_SUNXI=y CONFIG_MMC_BCM2835=y CONFIG_MMC_SDHCI_OMAP=y CONFIG_MMC_OWL=y -CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m CONFIG_LEDS_CPCAP=m @@ -895,7 +873,6 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y CONFIG_LEDS_MAX77693=m CONFIG_LEDS_MAX8997=m -CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -905,9 +882,10 @@ CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=y -CONFIG_EDAC=y -CONFIG_EDAC_HIGHBANK_MC=y -CONFIG_EDAC_HIGHBANK_L2=y +CONFIG_EDAC=m +CONFIG_EDAC_HIGHBANK_MC=m +CONFIG_EDAC_HIGHBANK_L2=m +CONFIG_EDAC_ASPEED=m CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AC100=y CONFIG_RTC_DRV_AS3722=y @@ -958,13 +936,11 @@ CONFIG_MV_XOR=y CONFIG_MXS_DMA=y CONFIG_OWL_DMA=y CONFIG_PL330_DMA=y -CONFIG_SIRF_DMA=y CONFIG_STE_DMA40=y CONFIG_ST_FDMA=m CONFIG_STM32_DMA=y CONFIG_STM32_DMAMUX=y CONFIG_STM32_MDMA=y -CONFIG_TEGRA20_APB_DMA=y CONFIG_UNIPHIER_MDMAC=y CONFIG_XILINX_DMA=y CONFIG_QCOM_BAM_DMA=y @@ -980,15 +956,14 @@ CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y CONFIG_STAGING_BOARD=y -CONFIG_MFD_CROS_EC_DEV=m +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=m CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_S2MPS11=m -CONFIG_CLK_ACTIONS=y -CONFIG_CLK_OWL_S500=y CONFIG_CLK_RASPBERRYPI=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_CLK_RPM=y @@ -1009,28 +984,28 @@ CONFIG_ASPEED_LPC_SNOOP=m CONFIG_ASPEED_P2A_CTRL=m CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_GSBI=y -CONFIG_QCOM_PM=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_ARCH_EMEV2=y +CONFIG_ARCH_R8A7794=y +CONFIG_ARCH_R8A7779=y +CONFIG_ARCH_R8A7790=y +CONFIG_ARCH_R8A7778=y +CONFIG_ARCH_R8A7793=y +CONFIG_ARCH_R8A7791=y +CONFIG_ARCH_R8A7792=y +CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R7S9210=y -CONFIG_ARCH_R8A73A4=y -CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A77470=y +CONFIG_ARCH_R8A7745=y CONFIG_ARCH_R8A7742=y CONFIG_ARCH_R8A7743=y CONFIG_ARCH_R8A7744=y -CONFIG_ARCH_R8A7745=y -CONFIG_ARCH_R8A77470=y -CONFIG_ARCH_R8A7778=y -CONFIG_ARCH_R8A7779=y -CONFIG_ARCH_R8A7790=y -CONFIG_ARCH_R8A7791=y -CONFIG_ARCH_R8A7792=y -CONFIG_ARCH_R8A7793=y -CONFIG_ARCH_R8A7794=y CONFIG_ARCH_R9A06G032=y CONFIG_ARCH_SH73A0=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y @@ -1053,12 +1028,12 @@ CONFIG_AT91_SAMA5D2_ADC=m CONFIG_BERLIN2_ADC=m CONFIG_CPCAP_ADC=m CONFIG_EXYNOS_ADC=m -CONFIG_STMPE_ADC=m CONFIG_MESON_SARADC=m CONFIG_ROCKCHIP_SARADC=m CONFIG_STM32_ADC_CORE=m CONFIG_STM32_ADC=m CONFIG_STM32_DFSDM_ADC=m +CONFIG_STMPE_ADC=m CONFIG_VF610_ADC=m CONFIG_XILINX_XADC=y CONFIG_IIO_CROS_EC_SENSORS_CORE=m @@ -1114,6 +1089,7 @@ CONFIG_PHY_DM816X_USB=m CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y CONFIG_TWL4030_USB=m +CONFIG_RAS=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_ROCKCHIP_EFUSE=m CONFIG_NVMEM_SUNXI_SID=y @@ -1160,12 +1136,12 @@ CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_FSL_CAAM=m -CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_ATMEL_AES=m CONFIG_CRYPTO_DEV_ATMEL_TDES=m CONFIG_CRYPTO_DEV_ATMEL_SHA=m +CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_STM32_CRC=m CONFIG_CRYPTO_DEV_STM32_HASH=m @@ -1174,6 +1150,3 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y -CONFIG_CHROME_PLATFORMS=y -CONFIG_CROS_EC=m -CONFIG_CROS_EC_CHARDEV=m
This regenerates the v7 defconfig, with some new options added to ensure drivers that were enabled in previous releases are once again enabled. This was generated atop next-20210607. SIRF was removed in commit f3a732843acc ("ARM: remove sirf prima2/atlas platforms"). This covers ARCH_SIRF, SERIAL_SIRFSOC, SERIAL_SIRFSOC_CONSOLE, I2C_SIRF, SPI_SIRF. SECCOMP is on by default as of commit 282a181b1a0d ("seccomp: Move config option SECCOMP to arch/Kconfig"). EVI_VARS was made x86 only in commit 963fabf37f6a ("efi: efivars: limit availability to X86 builds"). NET_SWITCHDEV is enabled by NET_DSA. I think this is a result of commit 227d72063fcc ("dsa: simplify Kconfig symbols and dependencies"). SIMPLE_PM_BUS is selected ARCH_OMAP2PLUS as of commit 2a39af3870e9 ("ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus"). SPI_AX88796C was enabled in v5.11 for Exynos boards, but the driver is not yet merged. There's still some work being doing to merge this driver, so leave it alone for now. MICREL_PHY is selected by the ks8851 ethernet driver as of f0791b92d2b6 ("net: ks8851: Select PHYLIB and MICREL_PHY in Kconfig"). SMSC_PHY is selected by USB_NET_SMSC95XX as of commit 05b35e7eb9a1 ("smsc95xx: add phylib support"). PTP_1588_CLOCK is unknown. SOmething ot do with FEC or STMMAC_ETH? The MSM pinctrl drivers fell out of the defconfig as of commit be117ca32261 ("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a selected config"). Add PINCTRL_MSM so these stay enabled. POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d62054 ("PM: AVS: smartreflex Move driver to soc specific drivers"). Add the new symbol. STMPE_I2C is default y. It was explicitly added to the defconfig in commit d8f0ddc83877 ("ARM: defconfig: add STMPE ADC driver for P4 Note") but it's not required. VIVID needs FB=y, which became disabled at some point, so enable it. This also ensure the FB_EFI and other drivers stay enabled. CLK_ACTIONS and CLK_OWL_S500 was explicitly added in commit 26ba4a474aec ("ARM: multi_v7_defconfig: Enable Actions Semi platform and drivers"), but it defaults on when ARCH_ACTIONS is enabled. Drop them. QCOM_PM became ARM_QCOM_SPM_CPUIDLE in commit a871be6b8eee ("cpuidle: Convert Qualcomm SPM driver to a generic CPUidle driver"). SND_MMP_SOC became CONFIG_SND_MMP_SOC_SSPA in commit a97e384ba78f ("ASoC: mmp-sspa: Add Device Tree support"). Enable that instead. MFD_CROS_EC_DEV defualts on when CROS_EC is enabled. TEGRA20_APB_DMA is selected by SOC_TEGRA_FUSE if ARCH_TEGRA_2x_SOC since commit 19d41e5e9c68 ("soc/tegra: fuse: Add APB DMA dependency for Tegra20"). USB_CHIPIDEA_TEGRA is enabled when USB_CHIPIDEA is enabled. It falls out of the defconfig but is enabled, as intended by d50229cee69b ("ARM: multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA"). EDAC depends on RAS, so enable it to ensure the EDAC drivers stay enabled. SND_CTL_LED selects LEDS_TRIGGERS and NEW_LEDS so they fall out of the defconfig. Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/configs/multi_v7_defconfig | 109 +++++++++++----------------- 1 file changed, 41 insertions(+), 68 deletions(-)