ARM: ixp4xx: Delete the D-Link DSM-G600 boardfiles
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 26 Jul 2021 12:35:38 +0000 (14:35 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 13 Aug 2021 12:51:55 +0000 (14:51 +0200)
This board is replaced with the corresponding device tree.

Cc: Michael-Luke Jones <mlj28@cam.ac.uk>
Cc: Rod Whitby <rod@whitby.id.au>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Michael Westerhof <mwester@dls.net>
Cc: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
arch/arm/mach-ixp4xx/dsmg600-pci.c [deleted file]
arch/arm/mach-ixp4xx/dsmg600-setup.c [deleted file]

index 2811aa6e1880caacacf9492c37383894ef2f2669..35ad6201bc7e08142eca80f13969bbd36eea5149 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_DSMG600
-       bool
-       prompt "D-Link DSM-G600 RevA"
-       depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support D-Link's
-         DSM-G600 RevA device. For more information on this platform,
-         see http://www.nslu2-linux.org/wiki/DSMG600/HomePage
-
 config ARCH_IXDP4XX
        bool
        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
index fc1b38f0b50a81356ad8a9707d622424744e8a14..3640115e2db966dd399f57dd5b922d1b5b48b16b 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_DSMG600)         += dsmg600-pci.o
 obj-pci-$(CONFIG_MACH_GATEWAY7001)     += gateway7001-pci.o
 obj-pci-$(CONFIG_MACH_WG302V2)         += wg302v2-pci.o
 obj-pci-$(CONFIG_MACH_FSG)             += fsg-pci.o
@@ -31,7 +30,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_DSMG600)      += dsmg600-setup.o
 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
 obj-$(CONFIG_MACH_WG302V2)     += wg302v2-setup.o
 obj-$(CONFIG_MACH_FSG)         += fsg-setup.o
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
deleted file mode 100644 (file)
index e997d97..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * DSM-G600 board-level PCI initialization
- *
- * Copyright (C) 2006 Tower Technologies
- * Author: Alessandro Zummo <a.zummo@towertech.it>
- *
- * 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                4
-#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
-#define INTF           6
-
-void __init dsmg600_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);
-       irq_set_irq_type(IXP4XX_GPIO_IRQ(INTF), IRQ_TYPE_LEVEL_LOW);
-       ixp4xx_pci_preinit();
-}
-
-static int __init dsmg600_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
-               { IXP4XX_GPIO_IRQ(INTE), -1, -1 },
-               { IXP4XX_GPIO_IRQ(INTA), -1, -1 },
-               { IXP4XX_GPIO_IRQ(INTB), IXP4XX_GPIO_IRQ(INTC),
-                 IXP4XX_GPIO_IRQ(INTD) },
-               { IXP4XX_GPIO_IRQ(INTF), -1, -1 },
-       };
-
-       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 dsmg600_pci = {
-       .nr_controllers = 1,
-       .ops            = &ixp4xx_ops,
-       .preinit        = dsmg600_pci_preinit,
-       .setup          = ixp4xx_setup,
-       .map_irq        = dsmg600_map_irq,
-};
-
-int __init dsmg600_pci_init(void)
-{
-       if (machine_is_dsmg600())
-               pci_common_init(&dsmg600_pci);
-
-       return 0;
-}
-
-subsys_initcall(dsmg600_pci_init);
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
deleted file mode 100644 (file)
index 4d4c62f..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * DSM-G600 board-setup
- *
- * Copyright (C) 2008 Rod Whitby <rod@whitby.id.au>
- * Copyright (C) 2006 Tower Technologies
- *
- * based on ixdp425-setup.c:
- *      Copyright (C) 2003-2004 MontaVista Software, Inc.
- * based on nslu2-power.c:
- *     Copyright (C) 2005 Tower Technologies
- * based on nslu2-io.c:
- *     Copyright (C) 2004 Karen Spearel
- *
- * Author: Alessandro Zummo <a.zummo@towertech.it>
- * Author: Michael Westerhof <mwester@dls.net>
- * Author: Rod Whitby <rod@whitby.id.au>
- * Maintainers: http://www.nslu2-linux.org/
- */
-#include <linux/gpio.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 <mach/hardware.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
-#include <asm/mach/time.h>
-
-#include "irqs.h"
-
-#define DSMG600_SDA_PIN                5
-#define DSMG600_SCL_PIN                4
-
-/* DSM-G600 Timer Setting */
-#define DSMG600_FREQ           66000000
-
-/* Buttons */
-#define DSMG600_PB_GPIO                15      /* power button */
-#define DSMG600_RB_GPIO                3       /* reset button */
-
-/* Power control */
-#define DSMG600_PO_GPIO                2       /* power off */
-
-/* LEDs */
-#define DSMG600_LED_PWR_GPIO   0
-#define DSMG600_LED_WLAN_GPIO  14
-
-static struct flash_platform_data dsmg600_flash_data = {
-       .map_name               = "cfi_probe",
-       .width                  = 2,
-};
-
-static struct resource dsmg600_flash_resource = {
-       .flags                  = IORESOURCE_MEM,
-};
-
-static struct platform_device dsmg600_flash = {
-       .name                   = "IXP4XX-Flash",
-       .id                     = 0,
-       .dev.platform_data      = &dsmg600_flash_data,
-       .num_resources          = 1,
-       .resource               = &dsmg600_flash_resource,
-};
-
-static struct gpiod_lookup_table dsmg600_i2c_gpiod_table = {
-       .dev_id         = "i2c-gpio.0",
-       .table          = {
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", DSMG600_SDA_PIN,
-                               NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", DSMG600_SCL_PIN,
-                               NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-       },
-};
-
-static struct platform_device dsmg600_i2c_gpio = {
-       .name                   = "i2c-gpio",
-       .id                     = 0,
-       .dev     = {
-               .platform_data  = NULL,
-       },
-};
-
-static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
-       {
-               I2C_BOARD_INFO("pcf8563", 0x51),
-       },
-};
-
-static struct gpio_led dsmg600_led_pins[] = {
-       {
-               .name           = "dsmg600:green:power",
-               .gpio           = DSMG600_LED_PWR_GPIO,
-       },
-       {
-               .name           = "dsmg600:green:wlan",
-               .gpio           = DSMG600_LED_WLAN_GPIO,
-               .active_low     = true,
-       },
-};
-
-static struct gpio_led_platform_data dsmg600_led_data = {
-       .num_leds               = ARRAY_SIZE(dsmg600_led_pins),
-       .leds                   = dsmg600_led_pins,
-};
-
-static struct platform_device dsmg600_leds = {
-       .name                   = "leds-gpio",
-       .id                     = -1,
-       .dev.platform_data      = &dsmg600_led_data,
-};
-
-static struct resource dsmg600_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 dsmg600_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 dsmg600_uart = {
-       .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM,
-       .dev.platform_data      = dsmg600_uart_data,
-       .num_resources          = ARRAY_SIZE(dsmg600_uart_resources),
-       .resource               = dsmg600_uart_resources,
-};
-
-static struct platform_device *dsmg600_devices[] __initdata = {
-       &dsmg600_i2c_gpio,
-       &dsmg600_flash,
-       &dsmg600_leds,
-};
-
-static void dsmg600_power_off(void)
-{
-       /* enable the pwr cntl and drive it high */
-       gpio_direction_output(DSMG600_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 dsmg600_power_handler(struct timer_list *unused);
-static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler);
-
-static void dsmg600_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(DSMG600_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(DSMG600_LED_PWR_GPIO, 0);
-               } else {
-                       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-               }
-       }
-
-       mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
-}
-
-static irqreturn_t dsmg600_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 void __init dsmg600_timer_init(void)
-{
-    /* The xtal on this machine is non-standard. */
-    ixp4xx_timer_freq = DSMG600_FREQ;
-
-    /* Call standard timer_init function. */
-    ixp4xx_timer_init();
-}
-
-static int __init dsmg600_gpio_init(void)
-{
-       if (!machine_is_dsmg600())
-               return 0;
-
-       gpio_request(DSMG600_RB_GPIO, "reset button");
-       if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
-               IRQF_TRIGGER_LOW, "DSM-G600 reset button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
-                       gpio_to_irq(DSMG600_RB_GPIO));
-       }
-
-       /*
-        * The power button on the D-Link DSM-G600 is on GPIO 15, but
-        * it cannot handle interrupts on that GPIO line.  So we'll
-        * have to poll it with a kernel timer.
-        */
-
-       /* Make sure that the power button GPIO is set up as an input */
-       gpio_request(DSMG600_PB_GPIO, "power button");
-       gpio_direction_input(DSMG600_PB_GPIO);
-       /* Request poweroff GPIO line */
-       gpio_request(DSMG600_PO_GPIO, "power off button");
-
-       /* Set the initial value for the power button IRQ handler */
-       power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
-
-       mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
-       return 0;
-}
-device_initcall(dsmg600_gpio_init);
-
-static void __init dsmg600_init(void)
-{
-       ixp4xx_sys_init();
-
-       dsmg600_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       dsmg600_flash_resource.end =
-               IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-
-       gpiod_add_lookup_table(&dsmg600_i2c_gpiod_table);
-       i2c_register_board_info(0, dsmg600_i2c_board_info,
-                               ARRAY_SIZE(dsmg600_i2c_board_info));
-
-       /* The UART is required on the DSM-G600 (Redboot cannot use the
-        * NIC) -- do it here so that it does *not* get removed if
-        * platform_add_devices fails!
-         */
-        (void)platform_device_register(&dsmg600_uart);
-
-       platform_add_devices(dsmg600_devices, ARRAY_SIZE(dsmg600_devices));
-
-       pm_power_off = dsmg600_power_off;
-}
-
-MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")
-       /* 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      = dsmg600_timer_init,
-       .init_machine   = dsmg600_init,
-#if defined(CONFIG_PCI)
-       .dma_zone_size  = SZ_64M,
-#endif
-       .restart        = ixp4xx_restart,
-MACHINE_END