* [PATCH 00/17] ARM: remove old board files
@ 2022-10-19 14:40 Arnd Bergmann
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2022-10-19 14:40 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Arnd Bergmann, Russell King, Aaro Koskinen, Janusz Krzysztofik,
Tony Lindgren, Andrew Lunn, Sebastian Hesselbarth,
Gregory Clement, Hartley Sweeten, Alexander Sverdlin,
Paul Walmsley, Kevin Hilman, Vinod Koul, Linus Walleij,
Bartosz Golaszewski, Lee Jones, Ulf Hansson, Mark Brown,
Felipe Balbi, Greg Kroah-Hartman, Alan Stern, Bin Liu,
Helge Deller, Wim Van Sebroeck, Guenter Roeck, Liam Girdwood,
Jaroslav Kysela, Takashi Iwai, Hubert Feurstein,
Krzysztof Halasa, Lennert Buytenhek, Sergey Lapin,
Krzysztof Kozlowski, Dan Williams, Pali Rohár, linux-kernel,
linux-omap, linux-usb, dmaengine, linux-gpio, linux-i2c,
linux-mmc, linux-spi, linux-fbdev, dri-devel, linux-watchdog,
alsa-devel
From: Arnd Bergmann <arnd@arndb.de>
This is the first part of the removal of old board files, addressing
all the easy cases:
cns3xxx and iop32x get removed completely, including a handful of device
driversm while ep93xx, dove, mv78xx0, orion, footbridge and omap1 all
keep basic platform support but drop support for all boards that have
no known users.
There are seven patches for other subsystems in this series. It would
be helpful to get everything merged in the same release if there are no
objections, but I don't care if I include them in the soc tree with an
Ack from the subsystem maintainers or the patches are applied directly
into the subsystem trees.
Arnd Bergmann (17):
ARM: at91: remove stale MAINTAINER file entries
ARM: cns3xxx: remove entire platform
mmc: remove cns3xxx driver
ARM: ep93xx: remove old board files
ASoC: remove unused ep93xx files
ARM: mv78xx0: un-deprecate Terastation WXL
ARM: orion: remove unused board files
ARM: orion5x: remove dsa_chip_data references
ARM: iop32x: remove the platform
dmaengine: remove iop-adma driver
gpio: remove iop driver
ARM: footbridge: remove CATS
ARM: omap1: remove unused board files
ARM: omap1: remove dead code
fbdev: omapfb: remove unused board support
spi: remove omap 100K driver
mfd: remove htc-i2cpld driver
CC: Russell King <linux@armlinux.org.uk>
CC: Aaro Koskinen <aaro.koskinen@iki.fi>
CC: Janusz Krzysztofik <jmkrzyszt@gmail.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Andrew Lunn <andrew@lunn.ch>
CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
CC: Gregory Clement <gregory.clement@bootlin.com>
CC: Hartley Sweeten <hsweeten@visionengravers.com>
CC: Alexander Sverdlin <alexander.sverdlin@gmail.com>
CC: Paul Walmsley <paul@pwsan.com>
CC: Kevin Hilman <khilman@kernel.org>
CC: Vinod Koul <vkoul@kernel.org>
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Bartosz Golaszewski <brgl@bgdev.pl>
CC: Lee Jones <lee@kernel.org>
CC: Ulf Hansson <ulf.hansson@linaro.org>
CC: Mark Brown <broonie@kernel.org>
CC: Felipe Balbi <balbi@kernel.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Alan Stern <stern@rowland.harvard.edu>
CC: Bin Liu <b-liu@ti.com>
CC: Helge Deller <deller@gmx.de>
CC: Wim Van Sebroeck <wim@linux-watchdog.org>
CC: Guenter Roeck <linux@roeck-us.net>
CC: Liam Girdwood <lgirdwood@gmail.com>
CC: Jaroslav Kysela <perex@perex.cz>
CC: Takashi Iwai <tiwai@suse.com>
Cc: Hubert Feurstein <hubert.feurstein@contec.at>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Sergey Lapin <slapin@ossfans.org>
CC: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
CC: Dan Williams <dan.j.williams@intel.com>
CC: "Pali Rohár" <pali@kernel.org>
CC: linux-kernel@vger.kernel.org
CC: linux-arm-kernel@lists.infradead.org
CC: linux-omap@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: dmaengine@vger.kernel.org
CC: linux-gpio@vger.kernel.org
CC: linux-i2c@vger.kernel.org
CC: linux-mmc@vger.kernel.org
CC: linux-spi@vger.kernel.org
CC: linux-fbdev@vger.kernel.org
CC: dri-devel@lists.freedesktop.org
CC: linux-watchdog@vger.kernel.org
CC: alsa-devel@alsa-project.org
MAINTAINERS | 57 -
arch/arm/Kconfig | 6 +-
arch/arm/Kconfig.debug | 52 +-
arch/arm/Makefile | 2 -
arch/arm/boot/compressed/misc-ep93xx.h | 13 +-
arch/arm/configs/cns3420vb_defconfig | 63 -
arch/arm/configs/iop32x_defconfig | 126 --
arch/arm/configs/mv78xx0_defconfig | 3 -
arch/arm/configs/omap1_defconfig | 2 -
arch/arm/kernel/entry-common.S | 15 -
arch/arm/kernel/head.S | 2 +-
arch/arm/mach-cns3xxx/Kconfig | 21 -
arch/arm/mach-cns3xxx/Makefile | 6 -
arch/arm/mach-cns3xxx/cns3420vb.c | 252 ---
arch/arm/mach-cns3xxx/cns3xxx.h | 593 -------
arch/arm/mach-cns3xxx/core.c | 410 -----
arch/arm/mach-cns3xxx/core.h | 32 -
arch/arm/mach-cns3xxx/devices.c | 108 --
arch/arm/mach-cns3xxx/devices.h | 17 -
arch/arm/mach-cns3xxx/pcie.c | 290 ----
arch/arm/mach-cns3xxx/pm.c | 120 --
arch/arm/mach-cns3xxx/pm.h | 20 -
arch/arm/mach-dove/Kconfig | 8 -
arch/arm/mach-dove/Makefile | 1 -
arch/arm/mach-dove/dove-db-setup.c | 101 --
arch/arm/mach-ep93xx/Kconfig | 63 -
arch/arm/mach-ep93xx/Makefile | 5 -
arch/arm/mach-ep93xx/adssphere.c | 41 -
arch/arm/mach-ep93xx/gesbc9312.c | 41 -
arch/arm/mach-ep93xx/micro9.c | 125 --
arch/arm/mach-ep93xx/simone.c | 128 --
arch/arm/mach-ep93xx/snappercl15.c | 162 --
arch/arm/mach-footbridge/Kconfig | 12 -
arch/arm/mach-footbridge/Makefile | 2 -
arch/arm/mach-footbridge/cats-hw.c | 98 --
arch/arm/mach-footbridge/cats-pci.c | 64 -
arch/arm/mach-footbridge/common.c | 3 -
arch/arm/mach-iop32x/Kconfig | 54 -
arch/arm/mach-iop32x/Makefile | 20 -
arch/arm/mach-iop32x/adma.c | 163 --
arch/arm/mach-iop32x/cp6.c | 48 -
arch/arm/mach-iop32x/em7210.c | 232 ---
arch/arm/mach-iop32x/glantank.c | 214 ---
arch/arm/mach-iop32x/glantank.h | 12 -
arch/arm/mach-iop32x/gpio-iop32x.h | 11 -
arch/arm/mach-iop32x/hardware.h | 38 -
arch/arm/mach-iop32x/i2c.c | 92 --
arch/arm/mach-iop32x/iop3xx.h | 326 ----
arch/arm/mach-iop32x/iq31244.c | 333 ----
arch/arm/mach-iop32x/iq31244.h | 16 -
arch/arm/mach-iop32x/iq80321.c | 192 ---
arch/arm/mach-iop32x/iq80321.h | 16 -
arch/arm/mach-iop32x/irq.c | 95 --
arch/arm/mach-iop32x/irqs.h | 48 -
arch/arm/mach-iop32x/n2100.c | 367 -----
arch/arm/mach-iop32x/n2100.h | 18 -
arch/arm/mach-iop32x/pci.c | 404 -----
arch/arm/mach-iop32x/pmu.c | 29 -
arch/arm/mach-iop32x/restart.c | 17 -
arch/arm/mach-iop32x/setup.c | 31 -
arch/arm/mach-iop32x/time.c | 179 --
arch/arm/mach-mv78xx0/Kconfig | 14 +-
arch/arm/mach-mv78xx0/Makefile | 2 -
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 101 --
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 86 -
arch/arm/mach-omap1/Kconfig | 93 +-
arch/arm/mach-omap1/Makefile | 18 -
arch/arm/mach-omap1/board-fsample.c | 366 -----
arch/arm/mach-omap1/board-generic.c | 85 -
arch/arm/mach-omap1/board-h2-mmc.c | 74 -
arch/arm/mach-omap1/board-h2.c | 448 -----
arch/arm/mach-omap1/board-h2.h | 38 -
arch/arm/mach-omap1/board-h3-mmc.c | 64 -
arch/arm/mach-omap1/board-h3.c | 455 -----
arch/arm/mach-omap1/board-h3.h | 35 -
arch/arm/mach-omap1/board-htcherald.c | 585 -------
arch/arm/mach-omap1/board-innovator.c | 481 ------
arch/arm/mach-omap1/board-nand.c | 33 -
arch/arm/mach-omap1/board-palmtt.c | 285 ----
arch/arm/mach-omap1/board-palmz71.c | 300 ----
arch/arm/mach-omap1/board-perseus2.c | 333 ----
arch/arm/mach-omap1/clock_data.c | 17 +-
arch/arm/mach-omap1/common.h | 8 -
arch/arm/mach-omap1/devices.c | 58 +-
arch/arm/mach-omap1/dma.c | 25 +-
arch/arm/mach-omap1/fpga.c | 186 ---
arch/arm/mach-omap1/fpga.h | 49 -
arch/arm/mach-omap1/gpio7xx.c | 272 ---
arch/arm/mach-omap1/i2c.c | 14 +-
arch/arm/mach-omap1/io.c | 24 -
arch/arm/mach-omap1/irq.c | 20 +-
arch/arm/mach-omap1/irqs.h | 9 -
arch/arm/mach-omap1/mcbsp.c | 83 -
arch/arm/mach-omap1/mtd-xip.h | 4 -
arch/arm/mach-omap1/mux.c | 52 -
arch/arm/mach-omap1/pm.c | 76 +-
arch/arm/mach-omap1/pm.h | 39 +-
arch/arm/mach-omap1/serial.c | 15 -
arch/arm/mach-omap1/sleep.S | 80 -
arch/arm/mach-omap1/sram-init.c | 7 +-
arch/arm/mach-omap1/usb.c | 34 +-
arch/arm/mach-orion5x/Kconfig | 59 -
arch/arm/mach-orion5x/Makefile | 8 -
arch/arm/mach-orion5x/common.c | 10 -
arch/arm/mach-orion5x/common.h | 2 -
arch/arm/mach-orion5x/db88f5281-setup.c | 376 -----
arch/arm/mach-orion5x/ls_hgl-setup.c | 275 ----
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 172 --
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 183 ---
arch/arm/mach-orion5x/rd88f5182-setup.c | 288 ----
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 120 --
arch/arm/mach-orion5x/wnr854t-setup.c | 175 --
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 263 ---
arch/arm/plat-orion/common.c | 31 -
arch/arm/plat-orion/include/plat/common.h | 3 -
drivers/dma/Kconfig | 8 -
drivers/dma/Makefile | 1 -
drivers/dma/iop-adma.c | 1554 ------------------
drivers/dma/iop-adma.h | 914 ----------
drivers/gpio/Kconfig | 10 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-iop.c | 59 -
drivers/i2c/busses/Kconfig | 8 +-
drivers/mfd/Kconfig | 11 +-
drivers/mfd/Makefile | 1 -
drivers/mfd/htc-i2cpld.c | 627 -------
drivers/mmc/host/Kconfig | 13 +-
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/sdhci-cns3xxx.c | 113 --
drivers/spi/Kconfig | 6 -
drivers/spi/Makefile | 1 -
drivers/spi/spi-omap-100k.c | 490 ------
drivers/spi/spi-omap-uwire.c | 16 +-
drivers/usb/gadget/udc/Kconfig | 2 +-
drivers/usb/gadget/udc/omap_udc.c | 24 +-
drivers/usb/host/Kconfig | 25 +-
drivers/usb/host/ohci-omap.c | 6 +-
drivers/usb/musb/musb_dma.h | 11 +-
drivers/usb/phy/phy-isp1301-omap.c | 91 +-
drivers/video/fbdev/omap/Kconfig | 9 -
drivers/video/fbdev/omap/Makefile | 6 -
drivers/video/fbdev/omap/lcd_h3.c | 82 -
drivers/video/fbdev/omap/lcd_htcherald.c | 59 -
drivers/video/fbdev/omap/lcd_inn1510.c | 69 -
drivers/video/fbdev/omap/lcd_inn1610.c | 99 --
drivers/video/fbdev/omap/lcd_palmtt.c | 65 -
drivers/video/fbdev/omap/lcd_palmz71.c | 59 -
drivers/video/fbdev/omap/lcdc.c | 2 -
drivers/watchdog/wdt285.c | 2 -
include/linux/htcpld.h | 23 -
include/linux/platform_data/leds-omap.h | 19 -
include/linux/soc/ti/omap1-soc.h | 35 -
sound/soc/cirrus/Kconfig | 23 -
sound/soc/cirrus/Makefile | 6 -
sound/soc/cirrus/ep93xx-ac97.c | 446 -----
sound/soc/cirrus/simone.c | 86 -
sound/soc/cirrus/snappercl15.c | 134 --
157 files changed, 60 insertions(+), 18109 deletions(-)
delete mode 100644 arch/arm/configs/cns3420vb_defconfig
delete mode 100644 arch/arm/configs/iop32x_defconfig
delete mode 100644 arch/arm/mach-cns3xxx/Kconfig
delete mode 100644 arch/arm/mach-cns3xxx/Makefile
delete mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c
delete mode 100644 arch/arm/mach-cns3xxx/cns3xxx.h
delete mode 100644 arch/arm/mach-cns3xxx/core.c
delete mode 100644 arch/arm/mach-cns3xxx/core.h
delete mode 100644 arch/arm/mach-cns3xxx/devices.c
delete mode 100644 arch/arm/mach-cns3xxx/devices.h
delete mode 100644 arch/arm/mach-cns3xxx/pcie.c
delete mode 100644 arch/arm/mach-cns3xxx/pm.c
delete mode 100644 arch/arm/mach-cns3xxx/pm.h
delete mode 100644 arch/arm/mach-dove/dove-db-setup.c
delete mode 100644 arch/arm/mach-ep93xx/adssphere.c
delete mode 100644 arch/arm/mach-ep93xx/gesbc9312.c
delete mode 100644 arch/arm/mach-ep93xx/micro9.c
delete mode 100644 arch/arm/mach-ep93xx/simone.c
delete mode 100644 arch/arm/mach-ep93xx/snappercl15.c
delete mode 100644 arch/arm/mach-footbridge/cats-hw.c
delete mode 100644 arch/arm/mach-footbridge/cats-pci.c
delete mode 100644 arch/arm/mach-iop32x/Kconfig
delete mode 100644 arch/arm/mach-iop32x/Makefile
delete mode 100644 arch/arm/mach-iop32x/adma.c
delete mode 100644 arch/arm/mach-iop32x/cp6.c
delete mode 100644 arch/arm/mach-iop32x/em7210.c
delete mode 100644 arch/arm/mach-iop32x/glantank.c
delete mode 100644 arch/arm/mach-iop32x/glantank.h
delete mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h
delete mode 100644 arch/arm/mach-iop32x/hardware.h
delete mode 100644 arch/arm/mach-iop32x/i2c.c
delete mode 100644 arch/arm/mach-iop32x/iop3xx.h
delete mode 100644 arch/arm/mach-iop32x/iq31244.c
delete mode 100644 arch/arm/mach-iop32x/iq31244.h
delete mode 100644 arch/arm/mach-iop32x/iq80321.c
delete mode 100644 arch/arm/mach-iop32x/iq80321.h
delete mode 100644 arch/arm/mach-iop32x/irq.c
delete mode 100644 arch/arm/mach-iop32x/irqs.h
delete mode 100644 arch/arm/mach-iop32x/n2100.c
delete mode 100644 arch/arm/mach-iop32x/n2100.h
delete mode 100644 arch/arm/mach-iop32x/pci.c
delete mode 100644 arch/arm/mach-iop32x/pmu.c
delete mode 100644 arch/arm/mach-iop32x/restart.c
delete mode 100644 arch/arm/mach-iop32x/setup.c
delete mode 100644 arch/arm/mach-iop32x/time.c
delete mode 100644 arch/arm/mach-mv78xx0/db78x00-bp-setup.c
delete mode 100644 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
delete mode 100644 arch/arm/mach-omap1/board-fsample.c
delete mode 100644 arch/arm/mach-omap1/board-generic.c
delete mode 100644 arch/arm/mach-omap1/board-h2-mmc.c
delete mode 100644 arch/arm/mach-omap1/board-h2.c
delete mode 100644 arch/arm/mach-omap1/board-h2.h
delete mode 100644 arch/arm/mach-omap1/board-h3-mmc.c
delete mode 100644 arch/arm/mach-omap1/board-h3.c
delete mode 100644 arch/arm/mach-omap1/board-h3.h
delete mode 100644 arch/arm/mach-omap1/board-htcherald.c
delete mode 100644 arch/arm/mach-omap1/board-innovator.c
delete mode 100644 arch/arm/mach-omap1/board-nand.c
delete mode 100644 arch/arm/mach-omap1/board-palmtt.c
delete mode 100644 arch/arm/mach-omap1/board-palmz71.c
delete mode 100644 arch/arm/mach-omap1/board-perseus2.c
delete mode 100644 arch/arm/mach-omap1/fpga.c
delete mode 100644 arch/arm/mach-omap1/fpga.h
delete mode 100644 arch/arm/mach-omap1/gpio7xx.c
delete mode 100644 arch/arm/mach-orion5x/db88f5281-setup.c
delete mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5182-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c
delete mode 100644 arch/arm/mach-orion5x/wrt350n-v2-setup.c
delete mode 100644 drivers/dma/iop-adma.c
delete mode 100644 drivers/dma/iop-adma.h
delete mode 100644 drivers/gpio/gpio-iop.c
delete mode 100644 drivers/mfd/htc-i2cpld.c
delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c
delete mode 100644 drivers/spi/spi-omap-100k.c
delete mode 100644 drivers/video/fbdev/omap/lcd_h3.c
delete mode 100644 drivers/video/fbdev/omap/lcd_htcherald.c
delete mode 100644 drivers/video/fbdev/omap/lcd_inn1510.c
delete mode 100644 drivers/video/fbdev/omap/lcd_inn1610.c
delete mode 100644 drivers/video/fbdev/omap/lcd_palmtt.c
delete mode 100644 drivers/video/fbdev/omap/lcd_palmz71.c
delete mode 100644 include/linux/htcpld.h
delete mode 100644 include/linux/platform_data/leds-omap.h
delete mode 100644 sound/soc/cirrus/ep93xx-ac97.c
delete mode 100644 sound/soc/cirrus/simone.c
delete mode 100644 sound/soc/cirrus/snappercl15.c
--
2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 12/17] ARM: footbridge: remove CATS
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
@ 2022-10-19 15:03 ` Arnd Bergmann
2022-10-19 19:45 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2022-10-19 15:03 UTC (permalink / raw)
To: linux-arm-kernel, Wim Van Sebroeck, Guenter Roeck
Cc: linux-kernel, Arnd Bergmann, Russell King, Linus Walleij, linux-watchdog
From: Arnd Bergmann <arnd@arndb.de>
Nobody seems to have a CATS machine any more, so remove
it now, leaving only NetWinder and EBSA285.
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/kernel/head.S | 2 +-
| 12 ----
| 2 -
| 98 -----------------------------
| 64 -------------------
| 3 -
drivers/watchdog/wdt285.c | 2 -
7 files changed, 1 insertion(+), 182 deletions(-)
delete mode 100644 arch/arm/mach-footbridge/cats-hw.c
delete mode 100644 arch/arm/mach-footbridge/cats-pci.c
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 29e2900178a1..656991055bc1 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -344,7 +344,7 @@ __create_page_tables:
ldr r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
#endif
-#if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)
+#if defined(CONFIG_ARCH_NETWINDER)
/*
* If we're using the NetWinder or CATS, we also need to map
* in the 16550-type serial port for the debug messages
--git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index b5e7cbfed119..78189997caa1 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -16,18 +16,6 @@ menuconfig ARCH_FOOTBRIDGE
if ARCH_FOOTBRIDGE
-config ARCH_CATS
- bool "CATS"
- depends on UNUSED_BOARD_FILES
- select CLKEVT_I8253
- select CLKSRC_I8253
- select ISA
- select FORCE_PCI
- help
- Say Y here if you intend to run this kernel on the CATS.
-
- Saying N will reduce the size of the Footbridge kernel.
-
config ARCH_EBSA285_HOST
bool "EBSA285 (host mode)"
select ARCH_EBSA285
--git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile
index 55d570739f19..1553cc01b45c 100644
--- a/arch/arm/mach-footbridge/Makefile
+++ b/arch/arm/mach-footbridge/Makefile
@@ -8,11 +8,9 @@
obj-y := common.o isa-irq.o isa.o isa-rtc.o dma-isa.o
pci-y += dc21285.o
-pci-$(CONFIG_ARCH_CATS) += cats-pci.o
pci-$(CONFIG_ARCH_EBSA285) += ebsa285-pci.o
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o
-obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o
obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o
obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
deleted file mode 100644
index e575dc0698cd..000000000000
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ /dev/null
@@ -1,98 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * linux/arch/arm/mach-footbridge/cats-hw.c
- *
- * CATS machine fixup
- *
- * Copyright (C) 1998, 1999 Russell King, Phil Blundell
- */
-#include <linux/ioport.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/screen_info.h>
-#include <linux/io.h>
-#include <linux/spinlock.h>
-
-#include <asm/hardware/dec21285.h>
-#include <asm/mach-types.h>
-#include <asm/setup.h>
-
-#include <asm/mach/arch.h>
-
-#include "common.h"
-
-#define CFG_PORT 0x370
-#define INDEX_PORT (CFG_PORT)
-#define DATA_PORT (CFG_PORT + 1)
-
-static int __init cats_hw_init(void)
-{
- if (machine_is_cats()) {
- /* Set Aladdin to CONFIGURE mode */
- outb(0x51, CFG_PORT);
- outb(0x23, CFG_PORT);
-
- /* Select logical device 3 */
- outb(0x07, INDEX_PORT);
- outb(0x03, DATA_PORT);
-
- /* Set parallel port to DMA channel 3, ECP+EPP1.9,
- enable EPP timeout */
- outb(0x74, INDEX_PORT);
- outb(0x03, DATA_PORT);
-
- outb(0xf0, INDEX_PORT);
- outb(0x0f, DATA_PORT);
-
- outb(0xf1, INDEX_PORT);
- outb(0x07, DATA_PORT);
-
- /* Select logical device 4 */
- outb(0x07, INDEX_PORT);
- outb(0x04, DATA_PORT);
-
- /* UART1 high speed mode */
- outb(0xf0, INDEX_PORT);
- outb(0x02, DATA_PORT);
-
- /* Select logical device 5 */
- outb(0x07, INDEX_PORT);
- outb(0x05, DATA_PORT);
-
- /* UART2 high speed mode */
- outb(0xf0, INDEX_PORT);
- outb(0x02, DATA_PORT);
-
- /* Set Aladdin to RUN mode */
- outb(0xbb, CFG_PORT);
- }
-
- return 0;
-}
-
-__initcall(cats_hw_init);
-
-/*
- * CATS uses soft-reboot by default, since
- * hard reboots fail on early boards.
- */
-static void __init
-fixup_cats(struct tag *tags, char **cmdline)
-{
-#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
- screen_info.orig_video_lines = 25;
- screen_info.orig_video_points = 16;
- screen_info.orig_y = 24;
-#endif
-}
-
-MACHINE_START(CATS, "Chalice-CATS")
- /* Maintainer: Philip Blundell */
- .atag_offset = 0x100,
- .reboot_mode = REBOOT_SOFT,
- .fixup = fixup_cats,
- .map_io = footbridge_map_io,
- .init_irq = footbridge_init_irq,
- .init_time = isa_timer_init,
- .restart = footbridge_restart,
-MACHINE_END
diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c
deleted file mode 100644
index 90b1e9be430e..000000000000
--- a/arch/arm/mach-footbridge/cats-pci.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * linux/arch/arm/mach-footbridge/cats-pci.c
- *
- * PCI bios-type initialisation for PCI machines
- *
- * Bits taken from various places.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/* cats host-specific stuff */
-static int irqmap_cats[] = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
-
-static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin)
-{
- return 0;
-}
-
-static int cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
- if (dev->irq >= 255)
- return -1; /* not a valid interrupt. */
-
- if (dev->irq >= 128)
- return dev->irq & 0x1f;
-
- if (dev->irq >= 1 && dev->irq <= 4)
- return irqmap_cats[dev->irq - 1];
-
- if (dev->irq != 0)
- printk("PCI: device %02x:%02x has unknown irq line %x\n",
- dev->bus->number, dev->devfn, dev->irq);
-
- return -1;
-}
-
-/*
- * why not the standard PCI swizzle? does this prevent 4-port tulip
- * cards being used (ie, pci-pci bridge based cards)?
- */
-static struct hw_pci cats_pci __initdata = {
- .swizzle = cats_no_swizzle,
- .map_irq = cats_map_irq,
- .nr_controllers = 1,
- .ops = &dc21285_ops,
- .setup = dc21285_setup,
- .preinit = dc21285_preinit,
- .postinit = dc21285_postinit,
-};
-
-static int __init cats_pci_init(void)
-{
- if (machine_is_cats())
- pci_common_init(&cats_pci);
- return 0;
-}
-
-subsys_initcall(cats_pci_init);
--git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c
index 629e4676ed77..85c598708c10 100644
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/common.c
@@ -206,9 +206,6 @@ void __init footbridge_init_irq(void)
*/
isa_init_irq(IRQ_PCI);
- if (machine_is_cats())
- isa_init_irq(IRQ_IN2);
-
if (machine_is_netwinder())
isa_init_irq(IRQ_IN3);
}
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 110249e5f642..5b7be7a62d54 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -206,8 +206,6 @@ static int __init footbridge_watchdog_init(void)
pr_info("Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",
soft_margin);
- if (machine_is_cats())
- pr_warn("Warning: Watchdog reset may not work on this machine\n");
return 0;
}
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 12/17] ARM: footbridge: remove CATS
2022-10-19 15:03 ` [PATCH 12/17] ARM: footbridge: remove CATS Arnd Bergmann
@ 2022-10-19 19:45 ` Linus Walleij
0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2022-10-19 19:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Wim Van Sebroeck, Guenter Roeck, linux-kernel,
Arnd Bergmann, Russell King, linux-watchdog
On Wed, Oct 19, 2022 at 5:15 PM Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Nobody seems to have a CATS machine any more, so remove
> it now, leaving only NetWinder and EBSA285.
>
> Cc: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
(IIRC the EBSA285 was the machine that David Rusling distributed
to a few Arm developers when he initiated OSS activities at Digital.)
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-19 19:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 14:40 [PATCH 00/17] ARM: remove old board files Arnd Bergmann
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
2022-10-19 15:03 ` [PATCH 12/17] ARM: footbridge: remove CATS Arnd Bergmann
2022-10-19 19:45 ` Linus Walleij
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).