* [PATCH v3 1/6] ARM: config: multi v7: Drop unavailable options
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-06-15 1:14 ` [PATCH v3 2/6] ARM: config: multi v7: Clean up enabled by default options Joel Stanley
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
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.
EVI_VARS was made x86 only in commit 963fabf37f6a ("efi: efivars: limit
availability to X86 builds").
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/configs/multi_v7_defconfig | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 52a0400fdd92..88159ebad90d 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
@@ -124,7 +123,6 @@ 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
@@ -352,8 +350,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
@@ -408,7 +404,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 +431,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
@@ -958,7 +952,6 @@ 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
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 2/6] ARM: config: multi v7: Clean up enabled by default options
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
2021-06-15 1:14 ` [PATCH v3 1/6] ARM: config: multi v7: Drop unavailable options Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-06-15 1:14 ` [PATCH v3 3/6] ARM: config: multi v7: Add renamed symbols Joel Stanley
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
A number of options in the defconfig are enabled by other options;
either through selects or defaults.
SECCOMP is on by default as of commit 282a181b1a0d ("seccomp: Move config
option SECCOMP to arch/Kconfig").
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").
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").
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.
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.
CROS_EC_CHARDEV defaults to MFD_CROS_EC_DEV, which defaults to CROS_EC since
commit 2fa2b980e3fe ("mfd / platform: cros_ec: Rename config to a better name").
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").
SERIAL_OWL_CONSOLE defaults to on when SERIAL_OWL=y, and has since it
was introduced.
Commit c6774ee035dc ("media: Kconfig: make filtering devices optional")
made MEDIA_PLATFORM_SUPPORT, MEDIA_CAMERA_SUPPORT and MEDIA_CEC_SUPPORT
default y if MEDIA_SUPPORT_FILTER is disabled, so they fall out of the
defconfig.
MEDIA_CONTROLLER is selected by a number of drivers in the config, and
additionally defaults to MEDIA_PLATFORM_SUPPORT which is enabled.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
v3:
- Leave PTP_1588_CLOCK in the config
---
arch/arm/configs/multi_v7_defconfig | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 88159ebad90d..f323004ef0b8 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -95,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
@@ -155,7 +154,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
@@ -194,7 +192,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
@@ -278,12 +275,9 @@ 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_USB_PEGASUS=y
CONFIG_USB_RTL8152=m
CONFIG_USB_LAN78XX=m
@@ -374,7 +368,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
@@ -568,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
@@ -625,10 +617,6 @@ CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_VEXPRESS=y
CONFIG_REGULATOR_WM8994=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
@@ -774,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
@@ -810,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
@@ -957,7 +943,6 @@ 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
@@ -973,15 +958,12 @@ CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
CONFIG_STAGING_BOARD=y
-CONFIG_MFD_CROS_EC_DEV=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
@@ -1169,4 +1151,3 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_EC=m
-CONFIG_CROS_EC_CHARDEV=m
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 3/6] ARM: config: multi v7: Add renamed symbols
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
2021-06-15 1:14 ` [PATCH v3 1/6] ARM: config: multi v7: Drop unavailable options Joel Stanley
2021-06-15 1:14 ` [PATCH v3 2/6] ARM: config: multi v7: Clean up enabled by default options Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-06-15 1:14 ` [PATCH v3 4/6] ARM: config: multi v7: Enable dependancies Joel Stanley
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
These options were renamed in recent times. Add the new name so the
driver is built again, and drop the old name.
POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d62054 ("PM: AVS:
smartreflex Move driver to soc specific drivers"). Add the new symbol.
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.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/configs/multi_v7_defconfig | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f323004ef0b8..7312413e0594 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -116,6 +116,7 @@ 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
@@ -467,7 +468,6 @@ 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
@@ -726,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
@@ -984,7 +984,6 @@ 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
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 4/6] ARM: config: multi v7: Enable dependancies
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
` (2 preceding siblings ...)
2021-06-15 1:14 ` [PATCH v3 3/6] ARM: config: multi v7: Add renamed symbols Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-06-15 1:14 ` [PATCH v3 5/6] ARM: config: mutli v7: Reenable FB dependency Joel Stanley
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
Some drivers have not been built as they gained dependencies in kconfig but those
dependencies were not added to the defconfig.
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.
EDAC depends on RAS, so enable it to ensure the EDAC drivers stay
enabled.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/configs/multi_v7_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 7312413e0594..89dd9501c80f 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -442,6 +442,7 @@ 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
@@ -1088,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
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 5/6] ARM: config: mutli v7: Reenable FB dependency
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
` (3 preceding siblings ...)
2021-06-15 1:14 ` [PATCH v3 4/6] ARM: config: multi v7: Enable dependancies Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-06-15 1:14 ` [PATCH v3 6/6] ARM: config: multi v7: Regenerate defconifg Joel Stanley
2021-09-14 8:31 ` [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
CONFIG_FB") the select was replaced with a depends on FB, disabling the
drivers that depended on it.
Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
VIDEO_VIVID.
It must be set to y and not a module as the test driver VIDEO_VIVID
requires it to be built in.
Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 89dd9501c80f..99138a457a42 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -703,6 +703,7 @@ 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
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 6/6] ARM: config: multi v7: Regenerate defconifg
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
` (4 preceding siblings ...)
2021-06-15 1:14 ` [PATCH v3 5/6] ARM: config: mutli v7: Reenable FB dependency Joel Stanley
@ 2021-06-15 1:14 ` Joel Stanley
2021-09-14 8:31 ` [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
6 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-06-15 1:14 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
These options have moved around when generating the defconfig. Update
them to reduce noise when generating future changes.
The exceptions are:
- NEW_LEDS and LEDS_TRIGGERS which should drop out as they are selected
by SND_CTL_LED. Instead we will improve the logic so SND_CTL_LED
doesn't force-enable the subsystem.
- The SPI_AX88796C network device. This was enabled in v5.11 for Exynos
boards. The driver is not yet merged but there's work being done, so
leave it alone for now.
- PTP_1588_CLOCK is implied by enabled drivers STMMAC_ETH, IGB, E1000E
and FEC, but this may be changed in the future as imply does not do
what it was originally intended to do.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
v3: Mention why PTP_1588_CLOCK is left in.
arch/arm/configs/multi_v7_defconfig | 56 ++++++++++++++---------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 99138a457a42..b8e9ea73bdc1 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -108,8 +108,8 @@ 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
@@ -279,6 +279,7 @@ CONFIG_ICPLUS_PHY=y
CONFIG_MARVELL_PHY=y
CONFIG_AT803X_PHY=y
CONFIG_ROCKCHIP_PHY=y
+CONFIG_DP83867_PHY=y
CONFIG_USB_PEGASUS=y
CONFIG_USB_RTL8152=m
CONFIG_USB_LAN78XX=m
@@ -437,7 +438,6 @@ 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
@@ -452,10 +452,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
@@ -468,8 +470,6 @@ CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TWL4030=y
-CONFIG_GPIO_MXC=y
-CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_POWER_RESET_AS3722=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_GPIO_RESTART=y
@@ -508,9 +508,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
@@ -617,6 +617,8 @@ 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_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
@@ -644,9 +646,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
@@ -667,11 +666,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
@@ -696,6 +690,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
@@ -960,6 +959,8 @@ CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
CONFIG_STAGING_BOARD=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=m
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_SPI=m
CONFIG_COMMON_CLK_MAX77686=y
@@ -989,24 +990,25 @@ CONFIG_QCOM_GSBI=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
@@ -1029,12 +1031,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
@@ -1137,12 +1139,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
@@ -1151,5 +1153,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
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 0/6] ARM: config: Refresh multi v7
2021-06-15 1:14 [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
` (5 preceding siblings ...)
2021-06-15 1:14 ` [PATCH v3 6/6] ARM: config: multi v7: Regenerate defconifg Joel Stanley
@ 2021-09-14 8:31 ` Joel Stanley
2021-09-14 14:03 ` Arnd Bergmann
6 siblings, 1 reply; 10+ messages in thread
From: Joel Stanley @ 2021-09-14 8:31 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Linux ARM
Hi Arnd,
On Tue, 15 Jun 2021 at 01:14, Joel Stanley <joel@jms.id.au> wrote:
>
> v3: This version adds r-b tags from Arnd and leaves the PTP_1588_CLOCK
> option alone.
>
> v2 can be found here:
>
> https://lore.kernel.org/linux-arm-kernel/20210610035412.93682-1-joel@jms.id.au/
>
> v1 can be found here:
>
> https://lore.kernel.org/linux-arm-kernel/20210608103833.598348-1-joel@jms.id.au/
>
> This refreshes the multi v7 defconfig, broken down to show why symbols
> are coming and going.
>
> There are a few drivers that were intended to be part of the config that
> are currently disabled, which will once again be tested.
>
> Joel Stanley (6):
> ARM: config: multi v7: Drop unavailable options
> ARM: config: multi v7: Clean up enabled by default options
> ARM: config: multi v7: Add renamed symbols
> ARM: config: multi v7: Enable dependancies
> ARM: config: mutli v7: Reenable FB dependency
> ARM: config: multi v7: Regenerate defconifg
I think I assumed this would be picked up, but I'm not sure why I thought that.
Do you want me to send a pull request for v5.16?
It would be handy to have these two patches in sooner rather than later:
> ARM: config: multi v7: Enable dependancies
> ARM: config: mutli v7: Reenable FB dependency
Cheers,
Joel
>
> arch/arm/configs/multi_v7_defconfig | 90 +++++++++++------------------
> 1 file changed, 33 insertions(+), 57 deletions(-)
>
> --
> 2.30.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3 0/6] ARM: config: Refresh multi v7
2021-09-14 8:31 ` [PATCH v3 0/6] ARM: config: Refresh multi v7 Joel Stanley
@ 2021-09-14 14:03 ` Arnd Bergmann
2021-09-16 7:31 ` Joel Stanley
0 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2021-09-14 14:03 UTC (permalink / raw)
To: Joel Stanley; +Cc: Arnd Bergmann, Linux ARM
On Tue, Sep 14, 2021 at 10:31 AM Joel Stanley <joel@jms.id.au> wrote:
> On Tue, 15 Jun 2021 at 01:14, Joel Stanley <joel@jms.id.au> wrote:
> >
> >
> > https://lore.kernel.org/linux-arm-kernel/20210608103833.598348-1-joel@jms.id.au/
> >
> > This refreshes the multi v7 defconfig, broken down to show why symbols
> > are coming and going.
> >
> > There are a few drivers that were intended to be part of the config that
> > are currently disabled, which will once again be tested.
> >
> > Joel Stanley (6):
> > ARM: config: multi v7: Drop unavailable options
> > ARM: config: multi v7: Clean up enabled by default options
> > ARM: config: multi v7: Add renamed symbols
> > ARM: config: multi v7: Enable dependancies
> > ARM: config: mutli v7: Reenable FB dependency
> > ARM: config: multi v7: Regenerate defconifg
>
> I think I assumed this would be picked up, but I'm not sure why I thought that.
>
> Do you want me to send a pull request for v5.16?
Ah right, I think I planned to merge them but then forgot about it as it
was not in patchwork. If you want to be sure we get to something, best
send it to soc@kernel.org so we at least remember to take a look.
> It would be handy to have these two patches in sooner rather than later:
>
> > ARM: config: multi v7: Enable dependancies
> > ARM: config: mutli v7: Reenable FB dependency
I applied these directly to the arm/fixes branch now.
Please rebase the rest on top of v5.15-rc1 or that branch (whichever works
better for you), and send them as separate patches or a pull request to
soc@kernel.org.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3 0/6] ARM: config: Refresh multi v7
2021-09-14 14:03 ` Arnd Bergmann
@ 2021-09-16 7:31 ` Joel Stanley
0 siblings, 0 replies; 10+ messages in thread
From: Joel Stanley @ 2021-09-16 7:31 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Linux ARM
On Tue, 14 Sept 2021 at 14:03, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tue, Sep 14, 2021 at 10:31 AM Joel Stanley <joel@jms.id.au> wrote:
> > On Tue, 15 Jun 2021 at 01:14, Joel Stanley <joel@jms.id.au> wrote:
> > >
> > >
> > > https://lore.kernel.org/linux-arm-kernel/20210608103833.598348-1-joel@jms.id.au/
> > >
> > > This refreshes the multi v7 defconfig, broken down to show why symbols
> > > are coming and going.
> > >
> > > There are a few drivers that were intended to be part of the config that
> > > are currently disabled, which will once again be tested.
> > >
> > > Joel Stanley (6):
> > > ARM: config: multi v7: Drop unavailable options
> > > ARM: config: multi v7: Clean up enabled by default options
> > > ARM: config: multi v7: Add renamed symbols
> > > ARM: config: multi v7: Enable dependancies
> > > ARM: config: mutli v7: Reenable FB dependency
> > > ARM: config: multi v7: Regenerate defconifg
> >
> > I think I assumed this would be picked up, but I'm not sure why I thought that.
> >
> > Do you want me to send a pull request for v5.16?
>
> Ah right, I think I planned to merge them but then forgot about it as it
> was not in patchwork. If you want to be sure we get to something, best
> send it to soc@kernel.org so we at least remember to take a look.
Thanks for the reminder, I really appreciate how quickly you respond
when something gets sent there.
> > It would be handy to have these two patches in sooner rather than later:
> >
> > > ARM: config: multi v7: Enable dependancies
> > > ARM: config: mutli v7: Reenable FB dependency
>
> I applied these directly to the arm/fixes branch now.
>
> Please rebase the rest on top of v5.15-rc1 or that branch (whichever works
> better for you), and send them as separate patches or a pull request to
> soc@kernel.org.
Will do. Thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread