2023-09-22 09:14:16

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH v2 6/6] MIPS: AR7: remove platform

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]>
Acked-by: Florian Fainelli <[email protected]>
---
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


2023-09-28 08:40:21

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform

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/[email protected]
> > [2] https://openwrt.org/docs/techref/targets/ar7
> >
> > Suggested-by: Jonas Gorski <[email protected]>
> > Signed-off-by: Wolfram Sang <[email protected]>
> > Acked-by: Florian Fainelli <[email protected]>
>
> 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 ]

2023-09-28 09:03:00

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform

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/[email protected]
> [2] https://openwrt.org/docs/techref/targets/ar7
>
> Suggested-by: Jonas Gorski <[email protected]>
> Signed-off-by: Wolfram Sang <[email protected]>
> Acked-by: Florian Fainelli <[email protected]>

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


Attachments:
(No filename) (772.00 B)
signature.asc (849.00 B)
Download all attachments

2023-09-28 09:11:25

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform


> > 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!


Attachments:
(No filename) (185.00 B)
signature.asc (849.00 B)
Download all attachments

2023-10-06 08:25:11

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform

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 ]

2023-10-19 08:52:38

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform

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 ]

2023-10-19 12:32:48

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH v2 6/6] MIPS: AR7: remove platform


> 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!


Attachments:
(No filename) (299.00 B)
signature.asc (849.00 B)
Download all attachments