When trying to get rid of the obsolete VLYNQ bus, Jonas and Florian
pointed out that its only user, the AR7 platform can probaly go entirely
[1]. This series does exactly that. Even OpenWRT has removed support
because these devices are "stuck with 3.18" [2].
It removes the drivers first, because watchdog and network include
platform specific headers. Once the drivers are gone, we remove the
platform. The patches are based on 6.6-rc2 and created with
"--irreversible-delete" to save some space.
My suggestion is that everything is merged via the MIPS tree in one go,
so we don't have broken drivers because of missing platform headers. But
maybe there are reasons for a two-cycle removal with the drivers first
and the platform later?
Looking forward to comments.
Happy hacking,
Wolfram
[1] https://lore.kernel.org/r/[email protected]
[2] https://openwrt.org/docs/techref/targets/ar7
Wolfram Sang (6):
serial: 8250: remove AR7 support
mtd: parsers: ar7: remove support
vlynq: remove bus driver
watchdog: ar7_wdt: remove driver to prepare for platform removal
net: cpmac: remove driver to prepare for platform removal
MIPS: AR7: remove platform
MAINTAINERS | 13 -
arch/arm/configs/pxa_defconfig | 1 -
arch/mips/Kbuild.platforms | 1 -
arch/mips/Kconfig | 22 -
arch/mips/ar7/Makefile | 11 -
arch/mips/ar7/Platform | 5 -
arch/mips/ar7/clock.c | 439 --------
arch/mips/ar7/gpio.c | 332 ------
arch/mips/ar7/irq.c | 165 ---
arch/mips/ar7/memory.c | 51 -
arch/mips/ar7/platform.c | 722 -------------
arch/mips/ar7/prom.c | 256 -----
arch/mips/ar7/setup.c | 93 --
arch/mips/ar7/time.c | 31 -
arch/mips/boot/compressed/uart-16550.c | 5 -
arch/mips/configs/ar7_defconfig | 119 ---
arch/mips/include/asm/mach-ar7/ar7.h | 191 ----
arch/mips/include/asm/mach-ar7/irq.h | 16 -
arch/mips/include/asm/mach-ar7/prom.h | 12 -
arch/mips/include/asm/mach-ar7/spaces.h | 22 -
drivers/Kconfig | 2 -
drivers/Makefile | 1 -
drivers/mtd/parsers/Kconfig | 5 -
drivers/mtd/parsers/Makefile | 1 -
drivers/mtd/parsers/ar7part.c | 129 ---
drivers/net/ethernet/ti/Kconfig | 9 +-
drivers/net/ethernet/ti/Makefile | 1 -
drivers/net/ethernet/ti/cpmac.c | 1251 -----------------------
drivers/tty/serial/8250/8250_port.c | 7 -
drivers/vlynq/Kconfig | 21 -
drivers/vlynq/Makefile | 6 -
drivers/vlynq/vlynq.c | 799 ---------------
drivers/watchdog/Kconfig | 6 -
drivers/watchdog/Makefile | 1 -
drivers/watchdog/ar7_wdt.c | 315 ------
include/linux/vlynq.h | 149 ---
include/uapi/linux/serial_core.h | 1 -
37 files changed, 1 insertion(+), 5210 deletions(-)
delete mode 100644 arch/mips/ar7/Makefile
delete mode 100644 arch/mips/ar7/Platform
delete mode 100644 arch/mips/ar7/clock.c
delete mode 100644 arch/mips/ar7/gpio.c
delete mode 100644 arch/mips/ar7/irq.c
delete mode 100644 arch/mips/ar7/memory.c
delete mode 100644 arch/mips/ar7/platform.c
delete mode 100644 arch/mips/ar7/prom.c
delete mode 100644 arch/mips/ar7/setup.c
delete mode 100644 arch/mips/ar7/time.c
delete mode 100644 arch/mips/configs/ar7_defconfig
delete mode 100644 arch/mips/include/asm/mach-ar7/ar7.h
delete mode 100644 arch/mips/include/asm/mach-ar7/irq.h
delete mode 100644 arch/mips/include/asm/mach-ar7/prom.h
delete mode 100644 arch/mips/include/asm/mach-ar7/spaces.h
delete mode 100644 drivers/mtd/parsers/ar7part.c
delete mode 100644 drivers/net/ethernet/ti/cpmac.c
delete mode 100644 drivers/vlynq/Kconfig
delete mode 100644 drivers/vlynq/Makefile
delete mode 100644 drivers/vlynq/vlynq.c
delete mode 100644 drivers/watchdog/ar7_wdt.c
delete mode 100644 include/linux/vlynq.h
--
2.35.1
AR7 is going to be removed from the Kernel, so remove its type
definition from 8250 code. As with previous removals, I checked with
Debian Code Search that 'PORT_AR7' is not used in userspace.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/tty/serial/8250/8250_port.c | 7 -------
include/uapi/linux/serial_core.h | 1 -
2 files changed, 8 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index fb891b67968f..a4f5d792679a 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -170,13 +170,6 @@ static const struct serial8250_config uart_config[] = {
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO,
},
- [PORT_AR7] = {
- .name = "AR7",
- .fifo_size = 16,
- .tx_loadsz = 16,
- .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
- .flags = UART_CAP_FIFO /* | UART_CAP_AFE */,
- },
[PORT_U6_16550A] = {
.name = "U6_16550A",
.fifo_size = 64,
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index add349889d0a..3b51901926f9 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -32,7 +32,6 @@
#define PORT_XSCALE 15
#define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
#define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
-#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
#define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */
#define PORT_TEGRA 20 /* NVIDIA Tegra internal UART */
#define PORT_XR17D15X 21 /* Exar XR17D15x UART */
--
2.35.1
After a discussion about removing VLYNQ support from the Kernel, it was
concluded that its only user, the AR7 platform can go [1]. Even OpenWRT
has removed support because these devices are "stuck with 3.18" [2].
[1] https://lore.kernel.org/r/[email protected]
[2] https://openwrt.org/docs/techref/targets/ar7
Suggested-by: Jonas Gorski <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
---
arch/mips/Kbuild.platforms | 1 -
arch/mips/Kconfig | 22 -
arch/mips/ar7/Makefile | 11 -
arch/mips/ar7/Platform | 5 -
arch/mips/ar7/clock.c | 439 --------------
arch/mips/ar7/gpio.c | 332 -----------
arch/mips/ar7/irq.c | 165 ------
arch/mips/ar7/memory.c | 51 --
arch/mips/ar7/platform.c | 722 ------------------------
arch/mips/ar7/prom.c | 256 ---------
arch/mips/ar7/setup.c | 93 ---
arch/mips/ar7/time.c | 31 -
arch/mips/boot/compressed/uart-16550.c | 5 -
arch/mips/configs/ar7_defconfig | 119 ----
arch/mips/include/asm/mach-ar7/ar7.h | 191 -------
arch/mips/include/asm/mach-ar7/irq.h | 16 -
arch/mips/include/asm/mach-ar7/prom.h | 12 -
arch/mips/include/asm/mach-ar7/spaces.h | 22 -
18 files changed, 2493 deletions(-)
delete mode 100644 arch/mips/ar7/Makefile
delete mode 100644 arch/mips/ar7/Platform
delete mode 100644 arch/mips/ar7/clock.c
delete mode 100644 arch/mips/ar7/gpio.c
delete mode 100644 arch/mips/ar7/irq.c
delete mode 100644 arch/mips/ar7/memory.c
delete mode 100644 arch/mips/ar7/platform.c
delete mode 100644 arch/mips/ar7/prom.c
delete mode 100644 arch/mips/ar7/setup.c
delete mode 100644 arch/mips/ar7/time.c
delete mode 100644 arch/mips/configs/ar7_defconfig
delete mode 100644 arch/mips/include/asm/mach-ar7/ar7.h
delete mode 100644 arch/mips/include/asm/mach-ar7/irq.h
delete mode 100644 arch/mips/include/asm/mach-ar7/prom.h
delete mode 100644 arch/mips/include/asm/mach-ar7/spaces.h
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index caad195ba5c1..a2311c4bce6a 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -2,7 +2,6 @@
# All platforms listed in alphabetic order
platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/
-platform-$(CONFIG_AR7) += ar7/
platform-$(CONFIG_ATH25) += ath25/
platform-$(CONFIG_ATH79) += ath79/
platform-$(CONFIG_BCM47XX) += bcm47xx/
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bc8421859006..76db82542519 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -202,28 +202,6 @@ config MIPS_ALCHEMY
select SYS_SUPPORTS_ZBOOT
select COMMON_CLK
-config AR7
- bool "Texas Instruments AR7"
- select BOOT_ELF32
- select COMMON_CLK
- select DMA_NONCOHERENT
- select CEVT_R4K
- select CSRC_R4K
- select IRQ_MIPS_CPU
- select NO_EXCEPT_FILL
- select SWAP_IO_SPACE
- select SYS_HAS_CPU_MIPS32_R1
- select SYS_HAS_EARLY_PRINTK
- select SYS_SUPPORTS_32BIT_KERNEL
- select SYS_SUPPORTS_LITTLE_ENDIAN
- select SYS_SUPPORTS_MIPS16
- select SYS_SUPPORTS_ZBOOT_UART16550
- select GPIOLIB
- select VLYNQ
- help
- Support for the Texas Instruments AR7 System-on-a-Chip
- family: TNETD7100, 7200 and 7300.
-
config ATH25
bool "Atheros AR231x/AR531x SoC support"
select CEVT_R4K
diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile
deleted file mode 100644
index cd51c6c6e686..000000000000
diff --git a/arch/mips/ar7/Platform b/arch/mips/ar7/Platform
deleted file mode 100644
index a9257cc01c3c..000000000000
diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c
deleted file mode 100644
index c717acbc5506..000000000000
diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
deleted file mode 100644
index 4ed833b9cc2f..000000000000
diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c
deleted file mode 100644
index f0a7942d393e..000000000000
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c
deleted file mode 100644
index ce8024c1a54e..000000000000
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
deleted file mode 100644
index 215149a85d83..000000000000
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
deleted file mode 100644
index 5810d3993fc6..000000000000
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
deleted file mode 100644
index 352d5dbc777c..000000000000
diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c
deleted file mode 100644
index 72aa77d7087b..000000000000
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c
index 96d28f211121..09dcd2c561d9 100644
--- a/arch/mips/boot/compressed/uart-16550.c
+++ b/arch/mips/boot/compressed/uart-16550.c
@@ -13,11 +13,6 @@
#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset))
#endif
-#ifdef CONFIG_AR7
-#include <ar7.h>
-#define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset))
-#endif
-
#ifdef CONFIG_MACH_INGENIC
#define INGENIC_UART_BASE_ADDR (0x10030000 + 0x1000 * CONFIG_ZBOOT_INGENIC_UART)
#define PORT(offset) (CKSEG1ADDR(INGENIC_UART_BASE_ADDR) + (4 * offset))
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig
deleted file mode 100644
index 329c60aa570a..000000000000
diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h
deleted file mode 100644
index 1e8621a6afa3..000000000000
diff --git a/arch/mips/include/asm/mach-ar7/irq.h b/arch/mips/include/asm/mach-ar7/irq.h
deleted file mode 100644
index 46bb730ea970..000000000000
diff --git a/arch/mips/include/asm/mach-ar7/prom.h b/arch/mips/include/asm/mach-ar7/prom.h
deleted file mode 100644
index 9e1d20b06f57..000000000000
diff --git a/arch/mips/include/asm/mach-ar7/spaces.h b/arch/mips/include/asm/mach-ar7/spaces.h
deleted file mode 100644
index a004d94dfbdd..000000000000
--
2.35.1
AR7 is going to be removed from the Kernel, so remove its watchdog
support. This allows us to remove the platform because this driver
includes a platform specific header.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/watchdog/Kconfig | 6 -
drivers/watchdog/Makefile | 1 -
drivers/watchdog/ar7_wdt.c | 315 -------------------------------------
3 files changed, 322 deletions(-)
delete mode 100644 drivers/watchdog/ar7_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 751458959411..b9f715d73fe8 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1768,12 +1768,6 @@ config SIBYTE_WDOG
To compile this driver as a loadable module, choose M here.
The module will be called sb_wdog.
-config AR7_WDT
- tristate "TI AR7 Watchdog Timer"
- depends on AR7 || (MIPS && 32BIT && COMPILE_TEST)
- help
- Hardware driver for the TI AR7 Watchdog Timer.
-
config TXX9_WDT
tristate "Toshiba TXx9 Watchdog Timer"
depends on CPU_TX49XX || (MIPS && COMPILE_TEST)
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 7eab9de311cb..7cbc34514ec1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -168,7 +168,6 @@ obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
-obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
deleted file mode 100644
index cdcaeb0961ac..000000000000
--
2.35.1
There are no users with a vlynq_driver in the Kernel tree. Also, only
the AR7 platform ever initialized a VLYNQ bus, but AR7 is going to be
removed from the Kernel. OpenWRT had some out-of-tree drivers which they
probably intended to upport, but AR7 devices are even there not
supported anymore because they are "stuck with Kernel
3.18" [1]. This code can go.
[1] https://openwrt.org/docs/techref/targets/ar7
Signed-off-by: Wolfram Sang <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
---
MAINTAINERS | 7 -
drivers/Kconfig | 2 -
drivers/Makefile | 1 -
drivers/vlynq/Kconfig | 21 --
drivers/vlynq/Makefile | 6 -
drivers/vlynq/vlynq.c | 799 -----------------------------------------
include/linux/vlynq.h | 149 --------
7 files changed, 985 deletions(-)
delete mode 100644 drivers/vlynq/Kconfig
delete mode 100644 drivers/vlynq/Makefile
delete mode 100644 drivers/vlynq/vlynq.c
delete mode 100644 include/linux/vlynq.h
diff --git a/MAINTAINERS b/MAINTAINERS
index bf0f54c24f81..bdd6e7ce962d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22961,13 +22961,6 @@ W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
F: drivers/media/test-drivers/vivid/*
-VLYNQ BUS
-M: Florian Fainelli <[email protected]>
-L: [email protected] (subscribers-only)
-S: Maintained
-F: drivers/vlynq/vlynq.c
-F: include/linux/vlynq.h
-
VM SOCKETS (AF_VSOCK)
M: Stefano Garzarella <[email protected]>
L: [email protected]
diff --git a/drivers/Kconfig b/drivers/Kconfig
index efb66e25fa2d..9c8b82ddebfe 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -135,8 +135,6 @@ source "drivers/uio/Kconfig"
source "drivers/vfio/Kconfig"
-source "drivers/vlynq/Kconfig"
-
source "drivers/virt/Kconfig"
source "drivers/virtio/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 1bec7819a837..f7eeec79ef66 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -151,7 +151,6 @@ obj-$(CONFIG_BCMA) += bcma/
obj-$(CONFIG_VHOST_RING) += vhost/
obj-$(CONFIG_VHOST_IOTLB) += vhost/
obj-$(CONFIG_VHOST) += vhost/
-obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_GREYBUS) += greybus/
obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_STAGING) += staging/
diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig
deleted file mode 100644
index e7f9492a0b04..000000000000
diff --git a/drivers/vlynq/Makefile b/drivers/vlynq/Makefile
deleted file mode 100644
index d9ce5b2b5ce0..000000000000
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c
deleted file mode 100644
index 4af6615808cc..000000000000
diff --git a/include/linux/vlynq.h b/include/linux/vlynq.h
deleted file mode 100644
index e9c0cd36c48a..000000000000
--
2.35.1
On 9/20/23 13:10, Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its type
> definition from 8250 code. As with previous removals, I checked with
> Debian Code Search that 'PORT_AR7' is not used in userspace.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
--
Florian
AR7 is going to be removed from the Kernel, so remove its support for
MTD.
Signed-off-by: Wolfram Sang <[email protected]>
---
arch/arm/configs/pxa_defconfig | 1 -
drivers/mtd/parsers/Kconfig | 5 --
drivers/mtd/parsers/Makefile | 1 -
drivers/mtd/parsers/ar7part.c | 129 ---------------------------------
4 files changed, 136 deletions(-)
delete mode 100644 drivers/mtd/parsers/ar7part.c
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index 23c131b0854b..9e81b1849e4c 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -100,7 +100,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
-CONFIG_MTD_AR7_PARTS=m
CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_OF_PARTS=m
CONFIG_MTD_AFS_PARTS=m
diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index 60738edcd5d5..da03ab6efe04 100644
--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -1,9 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-config MTD_AR7_PARTS
- tristate "TI AR7 partitioning parser"
- help
- TI AR7 partitioning parser support
-
config MTD_BCM47XX_PARTS
tristate "BCM47XX partitioning parser"
depends on BCM47XX || ARCH_BCM_5301X
diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile
index 0e70b621a1d8..9b00c62b837a 100644
--- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
obj-$(CONFIG_MTD_BRCM_U_BOOT) += brcm_u-boot.o
diff --git a/drivers/mtd/parsers/ar7part.c b/drivers/mtd/parsers/ar7part.c
deleted file mode 100644
index 8cd683711ac6..000000000000
--
2.35.1
On 9/20/23 13:10, Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its watchdog
> support. This allows us to remove the platform because this driver
> includes a platform specific header.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Acked-by: Guenter Roeck <[email protected]>
> ---
> drivers/watchdog/Kconfig | 6 -
> drivers/watchdog/Makefile | 1 -
> drivers/watchdog/ar7_wdt.c | 315 -------------------------------------
> 3 files changed, 322 deletions(-)
> delete mode 100644 drivers/watchdog/ar7_wdt.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 751458959411..b9f715d73fe8 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1768,12 +1768,6 @@ config SIBYTE_WDOG
> To compile this driver as a loadable module, choose M here.
> The module will be called sb_wdog.
>
> -config AR7_WDT
> - tristate "TI AR7 Watchdog Timer"
> - depends on AR7 || (MIPS && 32BIT && COMPILE_TEST)
> - help
> - Hardware driver for the TI AR7 Watchdog Timer.
> -
> config TXX9_WDT
> tristate "Toshiba TXx9 Watchdog Timer"
> depends on CPU_TX49XX || (MIPS && COMPILE_TEST)
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index 7eab9de311cb..7cbc34514ec1 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -168,7 +168,6 @@ obj-$(CONFIG_INDYDOG) += indydog.o
> obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
> obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
> obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
> -obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
> obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
> obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
> octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
> diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
> deleted file mode 100644
> index cdcaeb0961ac..000000000000
AR7 is going to be removed from the Kernel, so remove its networking
support in form of the cpmac driver. This allows us to remove the
platform because this driver includes a platform specific header.
Signed-off-by: Wolfram Sang <[email protected]>
---
MAINTAINERS | 6 -
drivers/net/ethernet/ti/Kconfig | 9 +-
drivers/net/ethernet/ti/Makefile | 1 -
drivers/net/ethernet/ti/cpmac.c | 1251 ------------------------------
4 files changed, 1 insertion(+), 1266 deletions(-)
delete mode 100644 drivers/net/ethernet/ti/cpmac.c
diff --git a/MAINTAINERS b/MAINTAINERS
index bdd6e7ce962d..00063d14c70b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5309,12 +5309,6 @@ M: Bence Csókás <[email protected]>
S: Maintained
F: drivers/i2c/busses/i2c-cp2615.c
-CPMAC ETHERNET DRIVER
-M: Florian Fainelli <[email protected]>
-L: [email protected]
-S: Maintained
-F: drivers/net/ethernet/ti/cpmac.c
-
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
M: Viresh Kumar <[email protected]>
M: Sudeep Holla <[email protected]>
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 88b5b1b47779..7a99a86888e9 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -6,7 +6,7 @@
config NET_VENDOR_TI
bool "Texas Instruments (TI) devices"
default y
- depends on PCI || EISA || AR7 || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3
+ depends on PCI || EISA || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3
help
If you have a network (Ethernet) card belonging to this class, say Y.
@@ -176,13 +176,6 @@ config TLAN
Please email feedback to <[email protected]>.
-config CPMAC
- tristate "TI AR7 CPMAC Ethernet support"
- depends on AR7
- select PHYLIB
- help
- TI AR7 CPMAC Ethernet support
-
config TI_ICSSG_PRUETH
tristate "TI Gigabit PRU Ethernet driver"
select PHYLIB
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
index 34fd7a716ba6..e38ec9d6c99b 100644
--- a/drivers/net/ethernet/ti/Makefile
+++ b/drivers/net/ethernet/ti/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o
obj-$(CONFIG_TI_CPSW_SWITCHDEV) += cpsw-common.o
obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o
ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o
obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
deleted file mode 100644
index 80eeeb463c4f..000000000000
--
2.35.1
On 21. 09. 23, 13:16, Andy Shevchenko wrote:
> On Thu, Sep 21, 2023 at 12:36:05PM +0200, Philippe Mathieu-Daudé wrote:
>> On 20/9/23 22:10, Wolfram Sang wrote:
>
>>> --- a/include/uapi/linux/serial_core.h
>>> +++ b/include/uapi/linux/serial_core.h
>>> @@ -32,7 +32,6 @@
>>> #define PORT_XSCALE 15
>>> #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
>>> #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
>>> -#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
>>
>> I'm a bit surprised definitions are removed from the uAPI, isn't
>> it expected to be very stable? Shouldn't it be better to keep it
>> defined but modify the comment, mentioning "obsolete" or "deprecated"?
>
> The numbers up to 20 must stay, they are being used somewhere, setserial
> implementation in busybox (IIRC).
But they define it if we don't:
#ifndef PORT_AR7
# define PORT_AR7 18
#endif
> NAK.
I don't mind either way. But likely we should reserve the field if we go
and remove it (setserial has a number->string mapping in busybox). Hm,
then reserving it or keep it? Perhaps keep it is better... So ack the
NACK :).
--
js
suse labs
On Thu, Sep 21, 2023 at 01:21:46PM +0200, Jiri Slaby wrote:
> On 21. 09. 23, 13:16, Andy Shevchenko wrote:
> > On Thu, Sep 21, 2023 at 12:36:05PM +0200, Philippe Mathieu-Daud? wrote:
> > > On 20/9/23 22:10, Wolfram Sang wrote:
...
> > > > -#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
> > >
> > > I'm a bit surprised definitions are removed from the uAPI, isn't
> > > it expected to be very stable? Shouldn't it be better to keep it
> > > defined but modify the comment, mentioning "obsolete" or "deprecated"?
> >
> > The numbers up to 20 must stay, they are being used somewhere, setserial
> > implementation in busybox (IIRC).
>
> But they define it if we don't:
> #ifndef PORT_AR7
> # define PORT_AR7 18
> #endif
Yep, but the problem is that we may not use that number anyway, because two
different versions of kernel can clash on the same version of tool that will
think about AR7 while it's something different. That's why instead of having
reserved space, better to leave with names assigned.
> > NAK.
> I don't mind either way. But likely we should reserve the field if we go and
> remove it (setserial has a number->string mapping in busybox). Hm, then
> reserving it or keep it? Perhaps keep it is better... So ack the NACK :).
--
With Best Regards,
Andy Shevchenko
On Wed, Sep 20, 2023 at 10:10:27PM +0200, Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its type
> definition from 8250 code. As with previous removals, I checked with
> Debian Code Search that 'PORT_AR7' is not used in userspace.
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
Acked-by: Greg Kroah-Hartman <[email protected]>
On 21/9/23 14:06, Wolfram Sang wrote:
> On Thu, Sep 21, 2023 at 12:37:54PM +0200, Philippe Mathieu-Daudé wrote:
>> On 20/9/23 22:10, Wolfram Sang wrote:
>>> There are no users with a vlynq_driver in the Kernel tree. Also, only
>>> the AR7 platform ever initialized a VLYNQ bus, but AR7 is going to be
>>> removed from the Kernel. OpenWRT had some out-of-tree drivers which they
>>> probably intended to upport, but AR7 devices are even there not
>>
>> Typo "support".
>
> "support" would also fit, but we use the term "upporting" frequently to
> express that we want to bring some code from downstream to upstream.
Oh I see, thanks, TIL :)
On 20/9/23 22:10, Wolfram Sang wrote:
> There are no users with a vlynq_driver in the Kernel tree. Also, only
> the AR7 platform ever initialized a VLYNQ bus, but AR7 is going to be
> removed from the Kernel. OpenWRT had some out-of-tree drivers which they
> probably intended to upport, but AR7 devices are even there not
Typo "support".
> supported anymore because they are "stuck with Kernel
> 3.18" [1]. This code can go.
>
> [1] https://openwrt.org/docs/techref/targets/ar7
>
> Signed-off-by: Wolfram Sang <[email protected]>
> Acked-by: Greg Kroah-Hartman <[email protected]>
> ---
> MAINTAINERS | 7 -
> drivers/Kconfig | 2 -
> drivers/Makefile | 1 -
> drivers/vlynq/Kconfig | 21 --
> drivers/vlynq/Makefile | 6 -
> drivers/vlynq/vlynq.c | 799 -----------------------------------------
> include/linux/vlynq.h | 149 --------
> 7 files changed, 985 deletions(-)
> delete mode 100644 drivers/vlynq/Kconfig
> delete mode 100644 drivers/vlynq/Makefile
> delete mode 100644 drivers/vlynq/vlynq.c
> delete mode 100644 include/linux/vlynq.h
> I don't mind either way. But likely we should reserve the field if we go and
> remove it (setserial has a number->string mapping in busybox). Hm, then
> reserving it or keep it? Perhaps keep it is better... So ack the NACK :).
Okay. I will resend with this number kept.
Thanks everyone for the input!
On Thu, Sep 21, 2023 at 12:37:54PM +0200, Philippe Mathieu-Daudé wrote:
> On 20/9/23 22:10, Wolfram Sang wrote:
> > There are no users with a vlynq_driver in the Kernel tree. Also, only
> > the AR7 platform ever initialized a VLYNQ bus, but AR7 is going to be
> > removed from the Kernel. OpenWRT had some out-of-tree drivers which they
> > probably intended to upport, but AR7 devices are even there not
>
> Typo "support".
"support" would also fit, but we use the term "upporting" frequently to
express that we want to bring some code from downstream to upstream.
Hi Wolfram,
(Adding Andy for commit 54b45ee8bd42 "serial: core: Remove
unused PORT_* definitions").
On 20/9/23 22:10, Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its type
> definition from 8250 code. As with previous removals, I checked with
> Debian Code Search that 'PORT_AR7' is not used in userspace.
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/tty/serial/8250/8250_port.c | 7 -------
> include/uapi/linux/serial_core.h | 1 -
> 2 files changed, 8 deletions(-)
> diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
> index add349889d0a..3b51901926f9 100644
> --- a/include/uapi/linux/serial_core.h
> +++ b/include/uapi/linux/serial_core.h
> @@ -32,7 +32,6 @@
> #define PORT_XSCALE 15
> #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
> #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
> -#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
I'm a bit surprised definitions are removed from the uAPI, isn't
it expected to be very stable? Shouldn't it be better to keep it
defined but modify the comment, mentioning "obsolete" or "deprecated"?
Regards,
Phil.
> #define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */
> #define PORT_TEGRA 20 /* NVIDIA Tegra internal UART */
> #define PORT_XR17D15X 21 /* Exar XR17D15x UART */
On Thu, Sep 21, 2023 at 12:36:05PM +0200, Philippe Mathieu-Daud? wrote:
> On 20/9/23 22:10, Wolfram Sang wrote:
> > --- a/include/uapi/linux/serial_core.h
> > +++ b/include/uapi/linux/serial_core.h
> > @@ -32,7 +32,6 @@
> > #define PORT_XSCALE 15
> > #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
> > #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */
> > -#define PORT_AR7 18 /* Texas Instruments AR7 internal UART */
>
> I'm a bit surprised definitions are removed from the uAPI, isn't
> it expected to be very stable? Shouldn't it be better to keep it
> defined but modify the comment, mentioning "obsolete" or "deprecated"?
The numbers up to 20 must stay, they are being used somewhere, setserial
implementation in busybox (IIRC).
NAK.
--
With Best Regards,
Andy Shevchenko
On Thu, Sep 21, 2023 at 12:36:05PM +0200, Philippe Mathieu-Daud? wrote:
> On 20/9/23 22:10, Wolfram Sang wrote:
> I'm a bit surprised definitions are removed from the uAPI, isn't
> it expected to be very stable?
They were added to uAPI by mistake to begin with. I don't know why people
still continue adding more there...
Basically we should stop to publish those numbers and move them into
internal header (except those 20 or so, that must stay).
--
With Best Regards,
Andy Shevchenko