ARM: ixp4xx: Delete NSLU2 boardfiles
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 14 Jul 2021 11:51:54 +0000 (13:51 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 13 Aug 2021 12:51:51 +0000 (14:51 +0200)
The NSLU2 is now completely migrated to use device tree exclusively
so delete the boardfiles.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
arch/arm/mach-ixp4xx/nslu2-pci.c [deleted file]
arch/arm/mach-ixp4xx/nslu2-setup.c [deleted file]

index bf14d65120b96a7b4bc132f0ae6bc610ed69ad02..0c3aa91da9dbdb520347fc33f0b3deed9aa03814 100644 (file)
@@ -17,15 +17,6 @@ config MACH_IXP4XX_OF
        help
          Say 'Y' here to support Device Tree-based IXP4xx platforms.
 
-config MACH_NSLU2
-       bool
-       prompt "Linksys NSLU2"
-       depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support Linksys's
-         NSLU2 NAS device. For more information on this platform,
-         see http://www.nslu2-linux.org
-
 config MACH_AVILA
        bool "Avila"
        depends on IXP4XX_PCI_LEGACY
index 1fa4e66057823c6bcee8278e229cf008440c867a..cee3c4609adcb7c92e4fe299a21848c5c62b745b 100644 (file)
@@ -15,7 +15,6 @@ obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
 obj-pci-$(CONFIG_ARCH_ADI_COYOTE)      += coyote-pci.o
 obj-pci-$(CONFIG_MACH_GTWX5715)                += gtwx5715-pci.o
 obj-pci-$(CONFIG_MACH_MICCPT)          += miccpt-pci.o
-obj-pci-$(CONFIG_MACH_NSLU2)           += nslu2-pci.o
 obj-pci-$(CONFIG_MACH_NAS100D)         += nas100d-pci.o
 obj-pci-$(CONFIG_MACH_DSMG600)         += dsmg600-pci.o
 obj-pci-$(CONFIG_MACH_GATEWAY7001)     += gateway7001-pci.o
@@ -33,7 +32,6 @@ obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
 obj-$(CONFIG_MACH_DEVIXP)      += omixp-setup.o
 obj-$(CONFIG_MACH_MICCPT)      += omixp-setup.o
 obj-$(CONFIG_MACH_MIC256)      += omixp-setup.o
-obj-$(CONFIG_MACH_NSLU2)       += nslu2-setup.o
 obj-$(CONFIG_MACH_NAS100D)     += nas100d-setup.o
 obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
deleted file mode 100644 (file)
index c07936a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * arch/arm/mach-ixp4xx/nslu2-pci.c
- *
- * NSLU2 board-level PCI initialization
- *
- * based on ixdp425-pci.c:
- *     Copyright (C) 2002 Intel Corporation.
- *     Copyright (C) 2003-2004 MontaVista Software, Inc.
- *
- * Maintainer: http://www.nslu2-linux.org/
- */
-
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-#include "irqs.h"
-
-#define MAX_DEV                3
-#define IRQ_LINES      3
-
-/* PCI controller GPIO to IRQ pin mappings */
-#define INTA           11
-#define INTB           10
-#define INTC           9
-#define INTD           8
-
-void __init nslu2_pci_preinit(void)
-{
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW);
-       ixp4xx_pci_preinit();
-}
-
-static int __init nslu2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       static int pci_irq_table[IRQ_LINES] = {
-               IXP4XX_GPIO_IRQ(INTA),
-               IXP4XX_GPIO_IRQ(INTB),
-               IXP4XX_GPIO_IRQ(INTC),
-       };
-
-       if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
-               return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
-
-       return -1;
-}
-
-struct hw_pci __initdata nslu2_pci = {
-       .nr_controllers = 1,
-       .ops            = &ixp4xx_ops,
-       .preinit        = nslu2_pci_preinit,
-       .setup          = ixp4xx_setup,
-       .map_irq        = nslu2_map_irq,
-};
-
-int __init nslu2_pci_init(void) /* monkey see, monkey do */
-{
-       if (machine_is_nslu2())
-               pci_common_init(&nslu2_pci);
-
-       return 0;
-}
-
-subsys_initcall(nslu2_pci_init);
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
deleted file mode 100644 (file)
index 8526a70..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * arch/arm/mach-ixp4xx/nslu2-setup.c
- *
- * NSLU2 board-setup
- *
- * Copyright (C) 2008 Rod Whitby <rod@whitby.id.au>
- *
- * based on ixdp425-setup.c:
- *      Copyright (C) 2003-2004 MontaVista Software, Inc.
- * based on nslu2-power.c:
- *     Copyright (C) 2005 Tower Technologies
- *
- * Author: Mark Rakes <mrakes at mac.com>
- * Author: Rod Whitby <rod@whitby.id.au>
- * Author: Alessandro Zummo <a.zummo@towertech.it>
- * Maintainers: http://www.nslu2-linux.org/
- *
- */
-#include <linux/gpio.h>
-#include <linux/if_ether.h>
-#include <linux/irq.h>
-#include <linux/serial.h>
-#include <linux/serial_8250.h>
-#include <linux/leds.h>
-#include <linux/reboot.h>
-#include <linux/i2c.h>
-#include <linux/gpio/machine.h>
-#include <linux/io.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
-#include <asm/mach/time.h>
-#include <mach/hardware.h>
-
-#include "irqs.h"
-
-#define NSLU2_SDA_PIN          7
-#define NSLU2_SCL_PIN          6
-
-/* NSLU2 Timer */
-#define NSLU2_FREQ 66000000
-
-/* Buttons */
-#define NSLU2_PB_GPIO          5       /* power button */
-#define NSLU2_PO_GPIO          8       /* power off */
-#define NSLU2_RB_GPIO          12      /* reset button */
-
-/* Buzzer */
-#define NSLU2_GPIO_BUZZ                4
-
-/* LEDs */
-#define NSLU2_LED_RED_GPIO     0
-#define NSLU2_LED_GRN_GPIO     1
-#define NSLU2_LED_DISK1_GPIO   3
-#define NSLU2_LED_DISK2_GPIO   2
-
-static struct flash_platform_data nslu2_flash_data = {
-       .map_name               = "cfi_probe",
-       .width                  = 2,
-};
-
-static struct resource nslu2_flash_resource = {
-       .flags                  = IORESOURCE_MEM,
-};
-
-static struct platform_device nslu2_flash = {
-       .name                   = "IXP4XX-Flash",
-       .id                     = 0,
-       .dev.platform_data      = &nslu2_flash_data,
-       .num_resources          = 1,
-       .resource               = &nslu2_flash_resource,
-};
-
-static struct gpiod_lookup_table nslu2_i2c_gpiod_table = {
-       .dev_id         = "i2c-gpio.0",
-       .table          = {
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NSLU2_SDA_PIN,
-                               NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NSLU2_SCL_PIN,
-                               NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-       },
-};
-
-static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
-       {
-               I2C_BOARD_INFO("x1205", 0x6f),
-       },
-};
-
-static struct gpio_led nslu2_led_pins[] = {
-       {
-               .name           = "nslu2:green:ready",
-               .gpio           = NSLU2_LED_GRN_GPIO,
-       },
-       {
-               .name           = "nslu2:red:status",
-               .gpio           = NSLU2_LED_RED_GPIO,
-       },
-       {
-               .name           = "nslu2:green:disk-1",
-               .gpio           = NSLU2_LED_DISK1_GPIO,
-               .active_low     = true,
-       },
-       {
-               .name           = "nslu2:green:disk-2",
-               .gpio           = NSLU2_LED_DISK2_GPIO,
-               .active_low     = true,
-       },
-};
-
-static struct gpio_led_platform_data nslu2_led_data = {
-       .num_leds               = ARRAY_SIZE(nslu2_led_pins),
-       .leds                   = nslu2_led_pins,
-};
-
-static struct platform_device nslu2_leds = {
-       .name                   = "leds-gpio",
-       .id                     = -1,
-       .dev.platform_data      = &nslu2_led_data,
-};
-
-static struct platform_device nslu2_i2c_gpio = {
-       .name                   = "i2c-gpio",
-       .id                     = 0,
-       .dev     = {
-               .platform_data  = NULL,
-       },
-};
-
-static struct resource nslu2_beeper_resources[] = {
-       {
-               .start  = IRQ_IXP4XX_TIMER2,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device nslu2_beeper = {
-       .name                   = "ixp4xx-beeper",
-       .id                     = NSLU2_GPIO_BUZZ,
-       .resource               = nslu2_beeper_resources,
-       .num_resources          = ARRAY_SIZE(nslu2_beeper_resources),
-};
-
-static struct resource nslu2_uart_resources[] = {
-       {
-               .start          = IXP4XX_UART1_BASE_PHYS,
-               .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = IXP4XX_UART2_BASE_PHYS,
-               .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       }
-};
-
-static struct plat_serial8250_port nslu2_uart_data[] = {
-       {
-               .mapbase        = IXP4XX_UART1_BASE_PHYS,
-               .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-               .irq            = IRQ_IXP4XX_UART1,
-               .flags          = UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = IXP4XX_UART_XTAL,
-       },
-       {
-               .mapbase        = IXP4XX_UART2_BASE_PHYS,
-               .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-               .irq            = IRQ_IXP4XX_UART2,
-               .flags          = UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = IXP4XX_UART_XTAL,
-       },
-       { }
-};
-
-static struct platform_device nslu2_uart = {
-       .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM,
-       .dev.platform_data      = nslu2_uart_data,
-       .num_resources          = 2,
-       .resource               = nslu2_uart_resources,
-};
-
-/* Built-in 10/100 Ethernet MAC interfaces */
-static struct resource nslu2_eth_resources[] = {
-       {
-               .start          = IXP4XX_EthB_BASE_PHYS,
-               .end            = IXP4XX_EthB_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct eth_plat_info nslu2_plat_eth[] = {
-       {
-               .phy            = 1,
-               .rxq            = 3,
-               .txreadyq       = 20,
-       }
-};
-
-static struct platform_device nslu2_eth[] = {
-       {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = nslu2_plat_eth,
-               .num_resources          = ARRAY_SIZE(nslu2_eth_resources),
-               .resource               = nslu2_eth_resources,
-       }
-};
-
-static struct platform_device *nslu2_devices[] __initdata = {
-       &nslu2_i2c_gpio,
-       &nslu2_flash,
-       &nslu2_beeper,
-       &nslu2_leds,
-       &nslu2_eth[0],
-};
-
-static void nslu2_power_off(void)
-{
-       /* This causes the box to drop the power and go dead. */
-
-       /* enable the pwr cntl gpio and assert power off */
-       gpio_direction_output(NSLU2_PO_GPIO, 1);
-}
-
-static irqreturn_t nslu2_power_handler(int irq, void *dev_id)
-{
-       /* Signal init to do the ctrlaltdel action, this will bypass init if
-        * it hasn't started and do a kernel_restart.
-        */
-       ctrl_alt_del();
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t nslu2_reset_handler(int irq, void *dev_id)
-{
-       /* This is the paper-clip reset, it shuts the machine down directly.
-        */
-       machine_power_off();
-
-       return IRQ_HANDLED;
-}
-
-static int __init nslu2_gpio_init(void)
-{
-       if (!machine_is_nslu2())
-               return 0;
-
-       /* Request the power off GPIO */
-       return gpio_request(NSLU2_PO_GPIO, "power off");
-}
-device_initcall(nslu2_gpio_init);
-
-static void __init nslu2_timer_init(void)
-{
-    /* The xtal on this machine is non-standard. */
-    ixp4xx_timer_freq = NSLU2_FREQ;
-
-    /* Call standard timer_init function. */
-    ixp4xx_timer_init();
-}
-
-static void __init nslu2_init(void)
-{
-       uint8_t __iomem *f;
-       int i;
-
-       ixp4xx_sys_init();
-
-       nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       nslu2_flash_resource.end =
-               IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-
-       gpiod_add_lookup_table(&nslu2_i2c_gpiod_table);
-       i2c_register_board_info(0, nslu2_i2c_board_info,
-                               ARRAY_SIZE(nslu2_i2c_board_info));
-
-       /*
-        * This is only useful on a modified machine, but it is valuable
-        * to have it first in order to see debug messages, and so that
-        * it does *not* get removed if platform_add_devices fails!
-        */
-       (void)platform_device_register(&nslu2_uart);
-
-       platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
-
-       pm_power_off = nslu2_power_off;
-
-       if (request_irq(gpio_to_irq(NSLU2_RB_GPIO), &nslu2_reset_handler,
-               IRQF_TRIGGER_LOW, "NSLU2 reset button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
-                       gpio_to_irq(NSLU2_RB_GPIO));
-       }
-
-       if (request_irq(gpio_to_irq(NSLU2_PB_GPIO), &nslu2_power_handler,
-               IRQF_TRIGGER_HIGH, "NSLU2 power button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Power Button IRQ %d not available\n",
-                       gpio_to_irq(NSLU2_PB_GPIO));
-       }
-
-       /*
-        * Map in a portion of the flash and read the MAC address.
-        * Since it is stored in BE in the flash itself, we need to
-        * byteswap it if we're in LE mode.
-        */
-       f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x40000);
-       if (f) {
-               for (i = 0; i < 6; i++)
-#ifdef __ARMEB__
-                       nslu2_plat_eth[0].hwaddr[i] = readb(f + 0x3FFB0 + i);
-#else
-                       nslu2_plat_eth[0].hwaddr[i] = readb(f + 0x3FFB0 + (i^3));
-#endif
-               iounmap(f);
-       }
-       printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n",
-              nslu2_plat_eth[0].hwaddr);
-
-}
-
-MACHINE_START(NSLU2, "Linksys NSLU2")
-       /* Maintainer: www.nslu2-linux.org */
-       .atag_offset    = 0x100,
-       .map_io         = ixp4xx_map_io,
-       .init_early     = ixp4xx_init_early,
-       .init_irq       = ixp4xx_init_irq,
-       .init_time      = nslu2_timer_init,
-       .init_machine   = nslu2_init,
-#if defined(CONFIG_PCI)
-       .dma_zone_size  = SZ_64M,
-#endif
-       .restart        = ixp4xx_restart,
-MACHINE_END