* [PATCH v2 0/6] remove AR7 platform and associated drivers
@ 2023-09-22 6:15 Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 1/6] serial: 8250: remove AR7 support Wolfram Sang
` (6 more replies)
0 siblings, 7 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, linux-arm-kernel,
linux-kernel, linux-mtd, linux-serial, linux-watchdog, netdev
Changes since v1:
* kept uapi define for for serial port type
* added acks
Still valid cover letter from v1:
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/3395161f-2543-46f0-83d9-b918800305e1@gmail.com
[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 ---
36 files changed, 1 insertion(+), 5209 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
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v2 1/6] serial: 8250: remove AR7 support
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 2/6] mtd: parsers: ar7: remove support Wolfram Sang
` (5 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, Greg Kroah-Hartman,
Jiri Slaby, linux-kernel, linux-serial
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 <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Changes since v1:
* added acks
* kept uapi define for for serial port type
drivers/tty/serial/8250/8250_port.c | 7 -------
1 file changed, 7 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,
--
2.35.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 1/6] serial: 8250: remove AR7 support Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-09-22 14:39 ` Miquel Raynal
2023-09-22 6:15 ` [PATCH v2 3/6] vlynq: remove bus driver Wolfram Sang
` (4 subsequent siblings)
6 siblings, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, Russell King,
Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
linux-arm-kernel, linux-kernel, linux-mtd
AR7 is going to be removed from the Kernel, so remove its support for
MTD.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v1:
* added ack
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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 3/6] vlynq: remove bus driver
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 1/6] serial: 8250: remove AR7 support Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 2/6] mtd: parsers: ar7: remove support Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 4/6] watchdog: ar7_wdt: remove driver to prepare for platform removal Wolfram Sang
` (3 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, Greg Kroah-Hartman,
linux-kernel
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 <wsa+renesas@sang-engineering.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v1:
* added ack
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 <f.fainelli@gmail.com>
-L: openwrt-devel@lists.openwrt.org (subscribers-only)
-S: Maintained
-F: drivers/vlynq/vlynq.c
-F: include/linux/vlynq.h
-
VM SOCKETS (AF_VSOCK)
M: Stefano Garzarella <sgarzare@redhat.com>
L: virtualization@lists.linux-foundation.org
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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 4/6] watchdog: ar7_wdt: remove driver to prepare for platform removal
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
` (2 preceding siblings ...)
2023-09-22 6:15 ` [PATCH v2 3/6] vlynq: remove bus driver Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-09-22 6:15 ` [PATCH net-next v2 5/6] net: cpmac: " Wolfram Sang
` (2 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, Guenter Roeck,
Wim Van Sebroeck, linux-watchdog, linux-kernel
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 <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
---
Changes since v1:
* added acks
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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
` (3 preceding siblings ...)
2023-09-22 6:15 ` [PATCH v2 4/6] watchdog: ar7_wdt: remove driver to prepare for platform removal Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-10-05 14:08 ` Thomas Bogendoerfer
2023-10-06 14:26 ` Jakub Kicinski
2023-09-22 6:15 ` [PATCH v2 6/6] MIPS: AR7: remove platform Wolfram Sang
2023-10-19 8:50 ` [PATCH v2 0/6] remove AR7 platform and associated drivers Thomas Bogendoerfer
6 siblings, 2 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, netdev
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 <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v1:
* added ack
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 <bence98@sch.bme.hu>
S: Maintained
F: drivers/i2c/busses/i2c-cp2615.c
-CPMAC ETHERNET DRIVER
-M: Florian Fainelli <f.fainelli@gmail.com>
-L: netdev@vger.kernel.org
-S: Maintained
-F: drivers/net/ethernet/ti/cpmac.c
-
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
M: Viresh Kumar <viresh.kumar@linaro.org>
M: Sudeep Holla <sudeep.holla@arm.com>
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 <torben.mathiasen@compaq.com>.
-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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 6/6] MIPS: AR7: remove platform
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
` (4 preceding siblings ...)
2023-09-22 6:15 ` [PATCH net-next v2 5/6] net: cpmac: " Wolfram Sang
@ 2023-09-22 6:15 ` Wolfram Sang
2023-09-28 7:06 ` Wolfram Sang
2023-10-19 8:50 ` [PATCH v2 0/6] remove AR7 platform and associated drivers Thomas Bogendoerfer
6 siblings, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 6:15 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Wolfram Sang, Thomas Bogendoerfer,
linux-kernel
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/3395161f-2543-46f0-83d9-b918800305e1@gmail.com
[2] https://openwrt.org/docs/techref/targets/ar7
Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v1:
* added ack
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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 6:15 ` [PATCH v2 2/6] mtd: parsers: ar7: remove support Wolfram Sang
@ 2023-09-22 14:39 ` Miquel Raynal
2023-09-22 17:55 ` Wolfram Sang
2023-09-28 7:10 ` Wolfram Sang
0 siblings, 2 replies; 24+ messages in thread
From: Miquel Raynal @ 2023-09-22 14:39 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-mips, Jonas Gorski, Florian Fainelli, Russell King,
Richard Weinberger, Vignesh Raghavendra, linux-arm-kernel,
linux-kernel, linux-mtd
Hi Wolfram,
wsa+renesas@sang-engineering.com wrote on Fri, 22 Sep 2023 08:15:23
+0200:
> AR7 is going to be removed from the Kernel, so remove its support for
> MTD.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changes since v1:
> * added ack
>
> arch/arm/configs/pxa_defconfig | 1 -
I'm not sure it is wise to merge defconfig changes through mtd. Would
you mind sending this change aside to avoid potential conflicts? Each
patch can live on their own anyway.
> drivers/mtd/parsers/Kconfig | 5 --
> drivers/mtd/parsers/Makefile | 1 -
> drivers/mtd/parsers/ar7part.c | 129 ---------------------------------
Do you have other changes related to this file in your tree? It failed
to apply on my side.
> 4 files changed, 136 deletions(-)
> delete mode 100644 drivers/mtd/parsers/ar7part.c
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 14:39 ` Miquel Raynal
@ 2023-09-22 17:55 ` Wolfram Sang
2023-09-22 18:35 ` Philippe Mathieu-Daudé
2023-09-28 7:10 ` Wolfram Sang
1 sibling, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-22 17:55 UTC (permalink / raw)
To: Miquel Raynal
Cc: linux-mips, Jonas Gorski, Florian Fainelli, Russell King,
Richard Weinberger, Vignesh Raghavendra, linux-arm-kernel,
linux-kernel, linux-mtd
[-- Attachment #1: Type: text/plain, Size: 733 bytes --]
> I'm not sure it is wise to merge defconfig changes through mtd. Would
> you mind sending this change aside to avoid potential conflicts? Each
> patch can live on their own anyway.
Yup, I can send a seperate patch for it.
> > drivers/mtd/parsers/Kconfig | 5 --
> > drivers/mtd/parsers/Makefile | 1 -
> > drivers/mtd/parsers/ar7part.c | 129 ---------------------------------
>
> Do you have other changes related to this file in your tree? It failed
> to apply on my side.
No change. Plain v6.6-rc2. I used "--irreversible-delete", though. Maybe
this is causing issues? As I stated in the cover-letter, I wonder if all
this should go via MIPS. But there hasn't been any discussion about it
yet.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 17:55 ` Wolfram Sang
@ 2023-09-22 18:35 ` Philippe Mathieu-Daudé
2023-09-25 7:11 ` Miquel Raynal
0 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-09-22 18:35 UTC (permalink / raw)
To: Wolfram Sang, Miquel Raynal, linux-mips, Jonas Gorski,
Florian Fainelli, Russell King, Richard Weinberger,
Vignesh Raghavendra, linux-arm-kernel, linux-kernel, linux-mtd
On 22/9/23 19:55, Wolfram Sang wrote:
>
>> I'm not sure it is wise to merge defconfig changes through mtd. Would
>> you mind sending this change aside to avoid potential conflicts? Each
>> patch can live on their own anyway.
>
> Yup, I can send a seperate patch for it.
>
>>> drivers/mtd/parsers/Kconfig | 5 --
>>> drivers/mtd/parsers/Makefile | 1 -
>>> drivers/mtd/parsers/ar7part.c | 129 ---------------------------------
>>
>> Do you have other changes related to this file in your tree? It failed
>> to apply on my side.
>
> No change. Plain v6.6-rc2. I used "--irreversible-delete", though. Maybe
> this is causing issues? As I stated in the cover-letter, I wonder if all
> this should go via MIPS. But there hasn't been any discussion about it
> yet.
MIPS tree for the whole series certainly makes sense.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 18:35 ` Philippe Mathieu-Daudé
@ 2023-09-25 7:11 ` Miquel Raynal
0 siblings, 0 replies; 24+ messages in thread
From: Miquel Raynal @ 2023-09-25 7:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
Russell King, Richard Weinberger, Vignesh Raghavendra,
linux-arm-kernel, linux-kernel, linux-mtd
Hi,
philmd@linaro.org wrote on Fri, 22 Sep 2023 20:35:16 +0200:
> On 22/9/23 19:55, Wolfram Sang wrote:
> >
> >> I'm not sure it is wise to merge defconfig changes through mtd. Would
> >> you mind sending this change aside to avoid potential conflicts? Each
> >> patch can live on their own anyway.
> >
> > Yup, I can send a seperate patch for it.
> >
> >>> drivers/mtd/parsers/Kconfig | 5 --
> >>> drivers/mtd/parsers/Makefile | 1 -
> >>> drivers/mtd/parsers/ar7part.c | 129 ---------------------------------
> >>
> >> Do you have other changes related to this file in your tree? It failed
> >> to apply on my side.
> >
> > No change. Plain v6.6-rc2. I used "--irreversible-delete", though. Maybe
> > this is causing issues? As I stated in the cover-letter, I wonder if all
> > this should go via MIPS. But there hasn't been any discussion about it
> > yet.
>
> MIPS tree for the whole series certainly makes sense.
Then:
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-09-22 6:15 ` [PATCH v2 6/6] MIPS: AR7: remove platform Wolfram Sang
@ 2023-09-28 7:06 ` Wolfram Sang
2023-09-28 7:29 ` Thomas Bogendoerfer
0 siblings, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-28 7:06 UTC (permalink / raw)
To: linux-mips
Cc: Jonas Gorski, Florian Fainelli, Thomas Bogendoerfer, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
On Fri, Sep 22, 2023 at 08:15:27AM +0200, Wolfram Sang wrote:
> 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/3395161f-2543-46f0-83d9-b918800305e1@gmail.com
> [2] https://openwrt.org/docs/techref/targets/ar7
>
> Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Hi Thomas,
most people involved in this series think that it will be best to take
the whole series via the MIPS tree. Do you agree?
Happy hacking,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-22 14:39 ` Miquel Raynal
2023-09-22 17:55 ` Wolfram Sang
@ 2023-09-28 7:10 ` Wolfram Sang
2023-10-02 9:39 ` Miquel Raynal
1 sibling, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-28 7:10 UTC (permalink / raw)
To: Miquel Raynal
Cc: linux-mips, Jonas Gorski, Florian Fainelli, Russell King,
Richard Weinberger, Vignesh Raghavendra, linux-arm-kernel,
linux-kernel, linux-mtd
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
> I'm not sure it is wise to merge defconfig changes through mtd. Would
> you mind sending this change aside to avoid potential conflicts? Each
> patch can live on their own anyway.
I checked pxa_defconfig history. Most commits in the last 7 years were
just removing outdated Kconfig symbols from all kind of subsystems. Like
what we want to do here. I think it is okay to keep it.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-09-28 7:06 ` Wolfram Sang
@ 2023-09-28 7:29 ` Thomas Bogendoerfer
2023-09-28 7:49 ` Wolfram Sang
0 siblings, 1 reply; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-09-28 7:29 UTC (permalink / raw)
To: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
linux-kernel
On Thu, Sep 28, 2023 at 09:06:19AM +0200, Wolfram Sang wrote:
> On Fri, Sep 22, 2023 at 08:15:27AM +0200, Wolfram Sang wrote:
> > 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/3395161f-2543-46f0-83d9-b918800305e1@gmail.com
> > [2] https://openwrt.org/docs/techref/targets/ar7
> >
> > Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Hi Thomas,
>
> most people involved in this series think that it will be best to take
> the whole series via the MIPS tree. Do you agree?
I'm fine taking it.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-09-28 7:29 ` Thomas Bogendoerfer
@ 2023-09-28 7:49 ` Wolfram Sang
2023-10-06 8:20 ` Thomas Bogendoerfer
0 siblings, 1 reply; 24+ messages in thread
From: Wolfram Sang @ 2023-09-28 7:49 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: linux-mips, Jonas Gorski, Florian Fainelli, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
> > most people involved in this series think that it will be best to take
> > the whole series via the MIPS tree. Do you agree?
>
> I'm fine taking it.
Awesome, thank you!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 2/6] mtd: parsers: ar7: remove support
2023-09-28 7:10 ` Wolfram Sang
@ 2023-10-02 9:39 ` Miquel Raynal
0 siblings, 0 replies; 24+ messages in thread
From: Miquel Raynal @ 2023-10-02 9:39 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-mips, Jonas Gorski, Florian Fainelli, Russell King,
Richard Weinberger, Vignesh Raghavendra, linux-arm-kernel,
linux-kernel, linux-mtd
Hi Wolfram,
wsa+renesas@sang-engineering.com wrote on Thu, 28 Sep 2023 09:10:24
+0200:
> > I'm not sure it is wise to merge defconfig changes through mtd. Would
> > you mind sending this change aside to avoid potential conflicts? Each
> > patch can live on their own anyway.
>
> I checked pxa_defconfig history. Most commits in the last 7 years were
> just removing outdated Kconfig symbols from all kind of subsystems. Like
> what we want to do here. I think it is okay to keep it.
>
Ok, I've acked the patch anyway, so now I expect it to be taken through
the mips tree as suggested earlier. Let me know if it's happening
differently.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal
2023-09-22 6:15 ` [PATCH net-next v2 5/6] net: cpmac: " Wolfram Sang
@ 2023-10-05 14:08 ` Thomas Bogendoerfer
2023-10-05 14:16 ` Jakub Kicinski
2023-10-06 14:26 ` Jakub Kicinski
1 sibling, 1 reply; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-10-05 14:08 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-mips, Jonas Gorski, Florian Fainelli, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, netdev
On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> 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 <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changes since v1:
> * added ack
>
> 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
> [..]
is it ok for network people to route this patch via mips-next tree
or do you want to apply to net-next ?
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal
2023-10-05 14:08 ` Thomas Bogendoerfer
@ 2023-10-05 14:16 ` Jakub Kicinski
2023-10-05 19:07 ` Thomas Bogendoerfer
0 siblings, 1 reply; 24+ messages in thread
From: Jakub Kicinski @ 2023-10-05 14:16 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
David S. Miller, Eric Dumazet, Paolo Abeni, linux-kernel, netdev
On Thu, 5 Oct 2023 16:08:55 +0200 Thomas Bogendoerfer wrote:
> On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> > 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 <wsa+renesas@sang-engineering.com>
> > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> > ---
> > Changes since v1:
> > * added ack
> >
> > 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
> > [..]
>
> is it ok for network people to route this patch via mips-next tree
> or do you want to apply to net-next ?
We have a ".remove callback should return void" conversion from Uwe
queued for the deleted driver (231ea972ccaf5b). The conflict will be
really trivial, but I guess no conflict beats trivial conflict so better
if we take it? :S
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal
2023-10-05 14:16 ` Jakub Kicinski
@ 2023-10-05 19:07 ` Thomas Bogendoerfer
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-10-05 19:07 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
David S. Miller, Eric Dumazet, Paolo Abeni, linux-kernel, netdev
On Thu, Oct 05, 2023 at 07:16:34AM -0700, Jakub Kicinski wrote:
> On Thu, 5 Oct 2023 16:08:55 +0200 Thomas Bogendoerfer wrote:
> > On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> > > 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 <wsa+renesas@sang-engineering.com>
> > > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> > > ---
> > > Changes since v1:
> > > * added ack
> > >
> > > 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
> > > [..]
> >
> > is it ok for network people to route this patch via mips-next tree
> > or do you want to apply to net-next ?
>
> We have a ".remove callback should return void" conversion from Uwe
> queued for the deleted driver (231ea972ccaf5b). The conflict will be
> really trivial, but I guess no conflict beats trivial conflict so better
> if we take it? :S
makes sense, so I'll just apply the other patches.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-09-28 7:49 ` Wolfram Sang
@ 2023-10-06 8:20 ` Thomas Bogendoerfer
2023-10-19 8:49 ` Thomas Bogendoerfer
0 siblings, 1 reply; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-10-06 8:20 UTC (permalink / raw)
To: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
linux-kernel
On Thu, Sep 28, 2023 at 09:49:38AM +0200, Wolfram Sang wrote:
>
> > > most people involved in this series think that it will be best to take
> > > the whole series via the MIPS tree. Do you agree?
> >
> > I'm fine taking it.
>
> Awesome, thank you!
the series doesn't apply to mips-next, can you rebase it top of it ?
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal
2023-09-22 6:15 ` [PATCH net-next v2 5/6] net: cpmac: " Wolfram Sang
2023-10-05 14:08 ` Thomas Bogendoerfer
@ 2023-10-06 14:26 ` Jakub Kicinski
1 sibling, 0 replies; 24+ messages in thread
From: Jakub Kicinski @ 2023-10-06 14:26 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-mips, Jonas Gorski, Florian Fainelli, David S. Miller,
Eric Dumazet, Paolo Abeni, linux-kernel, netdev
On Fri, 22 Sep 2023 08:15:26 +0200 Wolfram Sang wrote:
> 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 <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Applied to net-next (98bdeae9502b), thanks!
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-10-06 8:20 ` Thomas Bogendoerfer
@ 2023-10-19 8:49 ` Thomas Bogendoerfer
2023-10-19 12:32 ` Wolfram Sang
0 siblings, 1 reply; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-10-19 8:49 UTC (permalink / raw)
To: Wolfram Sang, linux-mips, Jonas Gorski, Florian Fainelli,
linux-kernel
On Fri, Oct 06, 2023 at 10:20:05AM +0200, Thomas Bogendoerfer wrote:
> On Thu, Sep 28, 2023 at 09:49:38AM +0200, Wolfram Sang wrote:
> >
> > > > most people involved in this series think that it will be best to take
> > > > the whole series via the MIPS tree. Do you agree?
> > >
> > > I'm fine taking it.
> >
> > Awesome, thank you!
>
> the series doesn't apply to mips-next, can you rebase it top of it ?
nevermind, I've did it by hand, but using --irreversible-delete isn't very
maintainer friendly as patches won't apply and I need to do the git rm
manually.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 0/6] remove AR7 platform and associated drivers
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
` (5 preceding siblings ...)
2023-09-22 6:15 ` [PATCH v2 6/6] MIPS: AR7: remove platform Wolfram Sang
@ 2023-10-19 8:50 ` Thomas Bogendoerfer
6 siblings, 0 replies; 24+ messages in thread
From: Thomas Bogendoerfer @ 2023-10-19 8:50 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-mips, Jonas Gorski, Florian Fainelli, linux-arm-kernel,
linux-kernel, linux-mtd, linux-serial, linux-watchdog, netdev
On Fri, Sep 22, 2023 at 08:15:21AM +0200, Wolfram Sang wrote:
> Changes since v1:
> * kept uapi define for for serial port type
> * added acks
>
> Still valid cover letter from v1:
>
> 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/3395161f-2543-46f0-83d9-b918800305e1@gmail.com
> [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 ---
> 36 files changed, 1 insertion(+), 5209 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
applied to mips-next, minus patch 5, which is already applied to net-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 6/6] MIPS: AR7: remove platform
2023-10-19 8:49 ` Thomas Bogendoerfer
@ 2023-10-19 12:32 ` Wolfram Sang
0 siblings, 0 replies; 24+ messages in thread
From: Wolfram Sang @ 2023-10-19 12:32 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: linux-mips, Jonas Gorski, Florian Fainelli, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
> nevermind, I've did it by hand, but using --irreversible-delete isn't very
> maintainer friendly as patches won't apply and I need to do the git rm
> manually.
I am really sorry, this slipped through the cracks :( Thanks for doing
it and feel free to ping me again and again next time!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2023-10-19 12:32 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 6:15 [PATCH v2 0/6] remove AR7 platform and associated drivers Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 1/6] serial: 8250: remove AR7 support Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 2/6] mtd: parsers: ar7: remove support Wolfram Sang
2023-09-22 14:39 ` Miquel Raynal
2023-09-22 17:55 ` Wolfram Sang
2023-09-22 18:35 ` Philippe Mathieu-Daudé
2023-09-25 7:11 ` Miquel Raynal
2023-09-28 7:10 ` Wolfram Sang
2023-10-02 9:39 ` Miquel Raynal
2023-09-22 6:15 ` [PATCH v2 3/6] vlynq: remove bus driver Wolfram Sang
2023-09-22 6:15 ` [PATCH v2 4/6] watchdog: ar7_wdt: remove driver to prepare for platform removal Wolfram Sang
2023-09-22 6:15 ` [PATCH net-next v2 5/6] net: cpmac: " Wolfram Sang
2023-10-05 14:08 ` Thomas Bogendoerfer
2023-10-05 14:16 ` Jakub Kicinski
2023-10-05 19:07 ` Thomas Bogendoerfer
2023-10-06 14:26 ` Jakub Kicinski
2023-09-22 6:15 ` [PATCH v2 6/6] MIPS: AR7: remove platform Wolfram Sang
2023-09-28 7:06 ` Wolfram Sang
2023-09-28 7:29 ` Thomas Bogendoerfer
2023-09-28 7:49 ` Wolfram Sang
2023-10-06 8:20 ` Thomas Bogendoerfer
2023-10-19 8:49 ` Thomas Bogendoerfer
2023-10-19 12:32 ` Wolfram Sang
2023-10-19 8:50 ` [PATCH v2 0/6] remove AR7 platform and associated drivers Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).