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/[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 ---
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
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]>
Acked-by: Florian Fainelli <[email protected]>
---
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 <[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 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 <[email protected]>
> Acked-by: Florian Fainelli <[email protected]>
> ---
> 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 ]
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 <[email protected]>
> > Acked-by: Florian Fainelli <[email protected]>
> > ---
> > 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
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 <[email protected]>
> > > Acked-by: Florian Fainelli <[email protected]>
> > > ---
> > > 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 ]
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 <[email protected]>
> Acked-by: Florian Fainelli <[email protected]>
Applied to net-next (98bdeae9502b), thanks!
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/[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 ---
> 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 ]