From e92ab51026ae1616697c21bb86c2b821856c0ea3 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 15:56:36 +0200 Subject: ARM: defconfig: reorder defconfig files The debug-info and can subystem options have moved around in the 'savedefconfig' output, so fix these up to reduce the clutter from the savedefconfig command. Reviewed-by: Claudiu Beznea Acked-by: Jernej Skrabec Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 12b35008571f..7ac539231a90 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -167,12 +167,6 @@ CONFIG_NET_DSA=m CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_CAN=y -CONFIG_CAN_AT91=m -CONFIG_CAN_FLEXCAN=m -CONFIG_CAN_SUN4I=y -CONFIG_CAN_XILINXCAN=y -CONFIG_CAN_RCAR=m -CONFIG_CAN_MCP251X=y CONFIG_BT=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_BCM=y @@ -300,6 +294,12 @@ CONFIG_MARVELL_PHY=y CONFIG_AT803X_PHY=y CONFIG_ROCKCHIP_PHY=y CONFIG_DP83867_PHY=y +CONFIG_CAN_AT91=m +CONFIG_CAN_FLEXCAN=m +CONFIG_CAN_SUN4I=y +CONFIG_CAN_XILINXCAN=y +CONFIG_CAN_RCAR=m +CONFIG_CAN_MCP251X=y CONFIG_MDIO_MSCC_MIIM=m CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8152=m -- cgit v1.2.3 From 7d40cecd0e36dcd6491a40d14c9b0d072f01e7aa Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:18:56 +0200 Subject: ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y This option is 'default y' and has always been this way, the line was added in error. Fixes: dfe21dcabac0 ("ARM: defconfig: Enable ax88796c driver for Exynos boards") Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7ac539231a90..ecf743b3409d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -254,7 +254,6 @@ CONFIG_SATA_HIGHBANK=y CONFIG_SATA_MV=y CONFIG_SATA_RCAR=y CONFIG_NETDEVICES=y -CONFIG_NET_VENDOR_ASIX=y CONFIG_VIRTIO_NET=y CONFIG_B53_SPI_DRIVER=m CONFIG_B53_MDIO_DRIVER=m -- cgit v1.2.3 From 1c9cb2bbf7ceee7fbebcecfc0d3c951d938731e7 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:22:35 +0200 Subject: ARM: defconfig: drop CONFIG_SERIAL_OMAP references This driver is mutually exclusive with the new 8250_OMAP driver, so 'make defconfig' turns it off already. Drop the reference now. Fixes: 077e1cde78c3 ("ARM: omap2plus_defconfig: Enable 8250_OMAP") Fixes: f98d45145e6a ("ARM: multi_v7_defconfig: Enable 8250-omap serial driver and use it by default") Acked-by: Tony Lindgren Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 2 -- arch/arm/configs/omap2plus_defconfig | 2 -- 2 files changed, 4 deletions(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ecf743b3409d..4cfe795981c8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -377,8 +377,6 @@ CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_BCM63XX=y CONFIG_SERIAL_BCM63XX_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index e273365838cb..89cda0877c52 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -419,8 +419,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_OMAP=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_I2C_CHARDEV=y CONFIG_SPI=y -- cgit v1.2.3 From 1441a15dd49616bd9dd4c25a018b0508cdada576 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:27:13 +0200 Subject: ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS This is now a hidden symbol, so just drop the defconfig line. Fixes: 42d95d1b3a9c ("drm/rcar: stop using 'imply' for dependencies") Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 4cfe795981c8..b3669cf855b3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -713,7 +713,6 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_RCAR_DU=m -CONFIG_DRM_RCAR_LVDS=y CONFIG_DRM_SUN4I=m CONFIG_DRM_MSM=m CONFIG_DRM_FSL_DCU=m -- cgit v1.2.3 From 39916e7d40e8dc9eca904e0b3e190753fa945ead Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:29:25 +0200 Subject: ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y PTP support is now enabled by default for configurations with ethernet support, so drop the redundant entries in defconfig files. Fixes: e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") Acked-by: Richard Cochran Signed-off-by: Arnd Bergmann --- arch/arm/configs/keystone_defconfig | 1 - arch/arm/configs/multi_v7_defconfig | 1 - arch/arm/configs/omap2plus_defconfig | 1 - 3 files changed, 3 deletions(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 97f958d55019..4a5b9adbf2a1 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -152,7 +152,6 @@ CONFIG_SPI=y CONFIG_SPI_CADENCE_QUADSPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y -CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index b3669cf855b3..a523591798cb 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -462,7 +462,6 @@ 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_MICROCHIP_SGPIO=y CONFIG_PINCTRL_OCELOT=y diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 89cda0877c52..39c89576ab2b 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -428,7 +428,6 @@ CONFIG_SPI_TI_QSPI=m CONFIG_HSI=m CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m -CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y -- cgit v1.2.3 From d1521bcef4fc58b20ca98d06c508529459be8329 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:36:59 +0200 Subject: ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI This is selected by CONFIG_SND_SOC_FSL_ASOC_CARD=m, so the extra line is redundant. Fixes: 212e3b6b8734 ("ARM: configs: Enable more audio support for i.MX") Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a523591798cb..7af627a816ec 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -778,7 +778,6 @@ CONFIG_SND_ATMEL_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m -CONFIG_SND_SOC_FSL_SAI=m CONFIG_SND_PXA_SOC_SSP=m CONFIG_SND_MMP_SOC_SSPA=m CONFIG_SND_PXA910_SOC=m -- cgit v1.2.3 From 1bc709eb315f58b5231c8f0137c73d2bdabca9cf Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 17:33:02 +0200 Subject: ARM: defconfig: drop CONFIG_USB_FSL_USB2 USB_FSL_USB2 is no longer available for Arm platforms and was replaced by the chipidea driver. Fixes: a390bef7db1f ("usb: gadget: fsl_mxc_udc: Remove the driver") Acked-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7af627a816ec..1cb293adecb1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -869,7 +869,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 -- cgit v1.2.3 From 8a981ea176e27f793120f098072ac993af3c81c8 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 17:48:10 +0200 Subject: ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B This is now default-enabled when CONFIG_SOC_SAMA7 is used, so the defconfig entry can be dropped. Fixes: f611af4c3bfa ("ARM: at91: Kconfig: implement PIT64B selection") Acked-by: Claudiu Beznea Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1cb293adecb1..2b564defe33e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1044,7 +1044,6 @@ CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y -CONFIG_MICROCHIP_PIT64B=y CONFIG_BCM2835_MBOX=y CONFIG_QCOM_APCS_IPC=y CONFIG_QCOM_IPCC=y -- cgit v1.2.3 From 8bd2b56b53dbfa87419e45614506222df1970ba5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:51:16 +0200 Subject: ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name The CONFIG_SND_SOC_AC97 symbol was recently enabled but does not actually exist. From the patch description, I assume that this was meant to be CONFIG_SND_SOC_AC97_CODEC, which is used in imx_v6_v7_defconfig. Fixes: 2cc1cd26e913 ("ARM: configs: Enable ASoC AC'97 glue") Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs/multi_v7_defconfig') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2b564defe33e..af79b21e2000 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -814,7 +814,7 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m CONFIG_SND_SOC_TEGRA_ALC5632=m CONFIG_SND_SOC_TEGRA_MAX98090=m CONFIG_SND_SOC_DAVINCI_MCASP=m -CONFIG_SND_SOC_AC97=m +CONFIG_SND_SOC_AC97_CODEC=m CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_CPCAP=m CONFIG_SND_SOC_CS42L51_I2C=m -- cgit v1.2.3