ARM: ixp4xx: Delete NAS100D boardfiles
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 14 Jul 2021 12:01:22 +0000 (14:01 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 13 Aug 2021 12:51:54 +0000 (14:51 +0200)
The NAS100D 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/nas100d-pci.c [deleted file]
arch/arm/mach-ixp4xx/nas100d-setup.c [deleted file]

index 0c3aa91da9dbdb520347fc33f0b3deed9aa03814..2811aa6e1880caacacf9492c37383894ef2f2669 100644 (file)
@@ -110,15 +110,6 @@ config ARCH_PRPMC1100
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/ixp4xx.rst>.
 
-config MACH_NAS100D
-       bool
-       prompt "NAS100D"
-       depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support Iomega's
-         NAS 100d device. For more information on this platform,
-         see http://www.nslu2-linux.org/wiki/NAS100d/HomePage
-
 config MACH_DSMG600
        bool
        prompt "D-Link DSM-G600 RevA"
index cee3c4609adcb7c92e4fe299a21848c5c62b745b..fc1b38f0b50a81356ad8a9707d622424744e8a14 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_NAS100D)         += nas100d-pci.o
 obj-pci-$(CONFIG_MACH_DSMG600)         += dsmg600-pci.o
 obj-pci-$(CONFIG_MACH_GATEWAY7001)     += gateway7001-pci.o
 obj-pci-$(CONFIG_MACH_WG302V2)         += wg302v2-pci.o
@@ -32,7 +31,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_NAS100D)     += nas100d-setup.o
 obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
 obj-$(CONFIG_MACH_WG302V2)     += wg302v2-setup.o
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
deleted file mode 100644 (file)
index 1176f9c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * arch/arm/mach-ixp4xx/nas100d-pci.c
- *
- * NAS 100d 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
-#define INTE           7
-
-void __init nas100d_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);
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW);
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTE), IRQ_TYPE_LEVEL_LOW);
-       ixp4xx_pci_preinit();
-}
-
-static int __init nas100d_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
-               { IXP4XX_GPIO_IRQ(INTA), -1, -1 },
-               { IXP4XX_GPIO_IRQ(INTB), -1, -1 },
-               { IXP4XX_GPIO_IRQ(INTC), IXP4XX_GPIO_IRQ(INTD),
-                 IXP4XX_GPIO_IRQ(INTE) },
-       };
-
-       if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
-               return pci_irq_table[slot - 1][pin - 1];
-
-       return -1;
-}
-
-struct hw_pci __initdata nas100d_pci = {
-       .nr_controllers = 1,
-       .ops            = &ixp4xx_ops,
-       .preinit        = nas100d_pci_preinit,
-       .setup          = ixp4xx_setup,
-       .map_irq        = nas100d_map_irq,
-};
-
-int __init nas100d_pci_init(void)
-{
-       if (machine_is_nas100d())
-               pci_common_init(&nas100d_pci);
-
-       return 0;
-}
-
-subsys_initcall(nas100d_pci_init);
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
deleted file mode 100644 (file)
index 6133cf0..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * arch/arm/mach-ixp4xx/nas100d-setup.c
- *
- * NAS 100d 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 nas100d-power.c:
- *     Copyright (C) 2005 Tower Technologies
- * based on nas100d-io.c
- *     Copyright (C) 2004 Karen Spearel
- *
- * Author: Alessandro Zummo <a.zummo@towertech.it>
- * Author: Rod Whitby <rod@whitby.id.au>
- * Maintainers: http://www.nslu2-linux.org/
- *
- */
-#include <linux/gpio.h>
-#include <linux/if_ether.h>
-#include <linux/irq.h>
-#include <linux/jiffies.h>
-#include <linux/timer.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 <mach/hardware.h>
-
-#include "irqs.h"
-
-#define NAS100D_SDA_PIN                5
-#define NAS100D_SCL_PIN                6
-
-/* Buttons */
-#define NAS100D_PB_GPIO         14   /* power button */
-#define NAS100D_RB_GPIO         4    /* reset button */
-
-/* Power control */
-#define NAS100D_PO_GPIO         12   /* power off */
-
-/* LEDs */
-#define NAS100D_LED_WLAN_GPIO  0
-#define NAS100D_LED_DISK_GPIO  3
-#define NAS100D_LED_PWR_GPIO   15
-
-static struct flash_platform_data nas100d_flash_data = {
-       .map_name               = "cfi_probe",
-       .width                  = 2,
-};
-
-static struct resource nas100d_flash_resource = {
-       .flags                  = IORESOURCE_MEM,
-};
-
-static struct platform_device nas100d_flash = {
-       .name                   = "IXP4XX-Flash",
-       .id                     = 0,
-       .dev.platform_data      = &nas100d_flash_data,
-       .num_resources          = 1,
-       .resource               = &nas100d_flash_resource,
-};
-
-static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
-       {
-               I2C_BOARD_INFO("pcf8563", 0x51),
-       },
-};
-
-static struct gpio_led nas100d_led_pins[] = {
-       {
-               .name           = "nas100d:green:wlan",
-               .gpio           = NAS100D_LED_WLAN_GPIO,
-               .active_low     = true,
-       },
-       {
-               .name           = "nas100d:blue:power",  /* (off=flashing) */
-               .gpio           = NAS100D_LED_PWR_GPIO,
-               .active_low     = true,
-       },
-       {
-               .name           = "nas100d:yellow:disk",
-               .gpio           = NAS100D_LED_DISK_GPIO,
-               .active_low     = true,
-       },
-};
-
-static struct gpio_led_platform_data nas100d_led_data = {
-       .num_leds               = ARRAY_SIZE(nas100d_led_pins),
-       .leds                   = nas100d_led_pins,
-};
-
-static struct platform_device nas100d_leds = {
-       .name                   = "leds-gpio",
-       .id                     = -1,
-       .dev.platform_data      = &nas100d_led_data,
-};
-
-static struct gpiod_lookup_table nas100d_i2c_gpiod_table = {
-       .dev_id         = "i2c-gpio.0",
-       .table          = {
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NAS100D_SDA_PIN,
-                               NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", NAS100D_SCL_PIN,
-                               NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-       },
-};
-
-static struct platform_device nas100d_i2c_gpio = {
-       .name                   = "i2c-gpio",
-       .id                     = 0,
-       .dev     = {
-               .platform_data  = NULL,
-       },
-};
-
-static struct resource nas100d_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 nas100d_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 nas100d_uart = {
-       .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM,
-       .dev.platform_data      = nas100d_uart_data,
-       .num_resources          = 2,
-       .resource               = nas100d_uart_resources,
-};
-
-/* Built-in 10/100 Ethernet MAC interfaces */
-static struct resource nas100d_eth_resources[] = {
-       {
-               .start          = IXP4XX_EthB_BASE_PHYS,
-               .end            = IXP4XX_EthB_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct eth_plat_info nas100d_plat_eth[] = {
-       {
-               .phy            = 0,
-               .rxq            = 3,
-               .txreadyq       = 20,
-       }
-};
-
-static struct platform_device nas100d_eth[] = {
-       {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev.platform_data      = nas100d_plat_eth,
-               .num_resources          = ARRAY_SIZE(nas100d_eth_resources),
-               .resource               = nas100d_eth_resources,
-       }
-};
-
-static struct platform_device *nas100d_devices[] __initdata = {
-       &nas100d_i2c_gpio,
-       &nas100d_flash,
-       &nas100d_leds,
-       &nas100d_eth[0],
-};
-
-static void nas100d_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(NAS100D_PO_GPIO, 1);
-}
-
-/* This is used to make sure the power-button pusher is serious.  The button
- * must be held until the value of this counter reaches zero.
- */
-static int power_button_countdown;
-
-/* Must hold the button down for at least this many counts to be processed */
-#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */
-
-static void nas100d_power_handler(struct timer_list *unused);
-static DEFINE_TIMER(nas100d_power_timer, nas100d_power_handler);
-
-static void nas100d_power_handler(struct timer_list *unused)
-{
-       /* This routine is called twice per second to check the
-        * state of the power button.
-        */
-
-       if (gpio_get_value(NAS100D_PB_GPIO)) {
-
-               /* IO Pin is 1 (button pushed) */
-               if (power_button_countdown > 0)
-                       power_button_countdown--;
-
-       } else {
-
-               /* Done on button release, to allow for auto-power-on mods. */
-               if (power_button_countdown == 0) {
-                       /* Signal init to do the ctrlaltdel action,
-                        * this will bypass init if it hasn't started
-                        * and do a kernel_restart.
-                        */
-                       ctrl_alt_del();
-
-                       /* Change the state of the power LED to "blink" */
-                       gpio_set_value(NAS100D_LED_PWR_GPIO, 0);
-               } else {
-                       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-               }
-       }
-
-       mod_timer(&nas100d_power_timer, jiffies + msecs_to_jiffies(500));
-}
-
-static irqreturn_t nas100d_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 nas100d_gpio_init(void)
-{
-       if (!machine_is_nas100d())
-               return 0;
-
-       /*
-        * The power button on the Iomega NAS100d is on GPIO 14, but
-        * it cannot handle interrupts on that GPIO line.  So we'll
-        * have to poll it with a kernel timer.
-        */
-
-       /* Request the power off GPIO */
-       gpio_request(NAS100D_PO_GPIO, "power off");
-
-       /* Make sure that the power button GPIO is set up as an input */
-       gpio_request(NAS100D_PB_GPIO, "power button");
-       gpio_direction_input(NAS100D_PB_GPIO);
-
-       /* Set the initial value for the power button IRQ handler */
-       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-
-       mod_timer(&nas100d_power_timer, jiffies + msecs_to_jiffies(500));
-
-       return 0;
-}
-device_initcall(nas100d_gpio_init);
-
-static void __init nas100d_init(void)
-{
-       uint8_t __iomem *f;
-       int i;
-
-       ixp4xx_sys_init();
-
-       nas100d_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       nas100d_flash_resource.end =
-               IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-
-       gpiod_add_lookup_table(&nas100d_i2c_gpiod_table);
-       i2c_register_board_info(0, nas100d_i2c_board_info,
-                               ARRAY_SIZE(nas100d_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(&nas100d_uart);
-
-       platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
-
-       pm_power_off = nas100d_power_off;
-
-       if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler,
-               IRQF_TRIGGER_LOW, "NAS100D reset button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
-                       gpio_to_irq(NAS100D_RB_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), 0x1000000);
-       if (f) {
-               for (i = 0; i < 6; i++)
-#ifdef __ARMEB__
-                       nas100d_plat_eth[0].hwaddr[i] = readb(f + 0xFC0FD8 + i);
-#else
-                       nas100d_plat_eth[0].hwaddr[i] = readb(f + 0xFC0FD8 + (i^3));
-#endif
-               iounmap(f);
-       }
-       printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n",
-              nas100d_plat_eth[0].hwaddr);
-
-}
-
-MACHINE_START(NAS100D, "Iomega NAS 100d")
-       /* 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      = ixp4xx_timer_init,
-       .init_machine   = nas100d_init,
-#if defined(CONFIG_PCI)
-       .dma_zone_size  = SZ_64M,
-#endif
-       .restart        = ixp4xx_restart,
-MACHINE_END