ARM: ixp4xx: Delete the Freecom FSG-3 boardfiles
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 29 Jul 2021 14:43:56 +0000 (16:43 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 13 Aug 2021 12:52:12 +0000 (14:52 +0200)
This board is replaced with the corresponding device tree.

Acked-by: Marc Zyngier <maz@kernel.org>
Tested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
arch/arm/mach-ixp4xx/fsg-pci.c [deleted file]
arch/arm/mach-ixp4xx/fsg-setup.c [deleted file]

index d63f6a6c3b681224a4e15752e75158e9b72df891..cd4ea0adf76e9a9ce7083c6ccd0c40af06c47897 100644 (file)
@@ -38,15 +38,6 @@ config ARCH_PRPMC1100
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/ixp4xx.rst>.
 
-config MACH_FSG
-       bool
-       prompt "Freecom FSG-3"
-       depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support Freecom's
-         FSG-3 device. For more information on this platform,
-         see http://www.nslu2-linux.org/wiki/FSG3/HomePage
-
 #
 # Certain registers and IRQs are only enabled if supporting IXP465 CPUs
 #
index 8530ce2e82b0c7119b1ce5d3fd05ca1b4a292686..b241094c96493190655e4c6eff2712b2716eb972 100644 (file)
@@ -10,12 +10,10 @@ obj-pci-n   :=
 obj-pci-$(CONFIG_MACH_IXP4XX_OF)       += ixp4xx-of.o
 
 obj-pci-$(CONFIG_MACH_GATEWAY7001)     += gateway7001-pci.o
-obj-pci-$(CONFIG_MACH_FSG)             += fsg-pci.o
 
 obj-y  += common.o
 
 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
-obj-$(CONFIG_MACH_FSG)         += fsg-setup.o
 obj-$(CONFIG_MACH_GORAMO_MLR)  += goramo_mlr.o
 
 obj-$(CONFIG_PCI)              += $(obj-pci-$(CONFIG_PCI)) common-pci.o
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
deleted file mode 100644 (file)
index 4122a61..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * arch/arch/mach-ixp4xx/fsg-pci.c
- *
- * FSG board-level PCI initialization
- *
- * Author: Rod Whitby <rod@whitby.id.au>
- * Maintainer: http://www.nslu2-linux.org/
- *
- * based on ixdp425-pci.c:
- *     Copyright (C) 2002 Intel Corporation.
- *     Copyright (C) 2003-2004 MontaVista Software, Inc.
- */
-
-#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   6
-#define INTB   7
-#define INTC   5
-
-void __init fsg_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 fsg_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       static int pci_irq_table[IRQ_LINES] = {
-               IXP4XX_GPIO_IRQ(INTC),
-               IXP4XX_GPIO_IRQ(INTB),
-               IXP4XX_GPIO_IRQ(INTA),
-       };
-
-       int irq = -1;
-       slot -= 11;
-
-       if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
-               irq = pci_irq_table[slot - 1];
-       printk(KERN_INFO "%s: Mapped slot %d pin %d to IRQ %d\n",
-              __func__, slot, pin, irq);
-
-       return irq;
-}
-
-struct hw_pci fsg_pci __initdata = {
-       .nr_controllers = 1,
-       .ops            = &ixp4xx_ops,
-       .preinit =        fsg_pci_preinit,
-       .setup =          ixp4xx_setup,
-       .map_irq =        fsg_map_irq,
-};
-
-int __init fsg_pci_init(void)
-{
-       if (machine_is_fsg())
-               pci_common_init(&fsg_pci);
-       return 0;
-}
-
-subsys_initcall(fsg_pci_init);
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
deleted file mode 100644 (file)
index 844329c..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * arch/arm/mach-ixp4xx/fsg-setup.c
- *
- * FSG 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: 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/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 FSG_SDA_PIN            12
-#define FSG_SCL_PIN            13
-
-#define FSG_SB_GPIO            4       /* sync button */
-#define FSG_RB_GPIO            9       /* reset button */
-#define FSG_UB_GPIO            10      /* usb button */
-
-static struct flash_platform_data fsg_flash_data = {
-       .map_name               = "cfi_probe",
-       .width                  = 2,
-};
-
-static struct resource fsg_flash_resource = {
-       .flags                  = IORESOURCE_MEM,
-};
-
-static struct platform_device fsg_flash = {
-       .name                   = "IXP4XX-Flash",
-       .id                     = 0,
-       .dev = {
-               .platform_data  = &fsg_flash_data,
-       },
-       .num_resources          = 1,
-       .resource               = &fsg_flash_resource,
-};
-
-static struct gpiod_lookup_table fsg_i2c_gpiod_table = {
-       .dev_id         = "i2c-gpio.0",
-       .table          = {
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", FSG_SDA_PIN,
-                               NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-               GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", FSG_SCL_PIN,
-                               NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
-       },
-};
-
-static struct platform_device fsg_i2c_gpio = {
-       .name                   = "i2c-gpio",
-       .id                     = 0,
-       .dev = {
-               .platform_data  = NULL,
-       },
-};
-
-static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
-       {
-               I2C_BOARD_INFO("isl1208", 0x6f),
-       },
-};
-
-static struct resource fsg_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 fsg_uart_data[] = {
-       {
-               .mapbase        = IXP4XX_UART1_BASE_PHYS,
-               .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
-               .irq            = IRQ_IXP4XX_UART1,
-               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
-               .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 | UPF_SKIP_TEST,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = IXP4XX_UART_XTAL,
-       },
-       { }
-};
-
-static struct platform_device fsg_uart = {
-       .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM,
-       .dev = {
-               .platform_data  = fsg_uart_data,
-       },
-       .num_resources          = ARRAY_SIZE(fsg_uart_resources),
-       .resource               = fsg_uart_resources,
-};
-
-static struct platform_device fsg_leds = {
-       .name           = "fsg-led",
-       .id             = -1,
-};
-
-/* Built-in 10/100 Ethernet MAC interfaces */
-static struct resource fsg_eth_npeb_resources[] = {
-       {
-               .start          = IXP4XX_EthB_BASE_PHYS,
-               .end            = IXP4XX_EthB_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct resource fsg_eth_npec_resources[] = {
-       {
-               .start          = IXP4XX_EthC_BASE_PHYS,
-               .end            = IXP4XX_EthC_BASE_PHYS + 0x0fff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct eth_plat_info fsg_plat_eth[] = {
-       {
-               .phy            = 5,
-               .rxq            = 3,
-               .txreadyq       = 20,
-       }, {
-               .phy            = 4,
-               .rxq            = 4,
-               .txreadyq       = 21,
-       }
-};
-
-static struct platform_device fsg_eth[] = {
-       {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEB,
-               .dev = {
-                       .platform_data  = fsg_plat_eth,
-               },
-               .num_resources  = ARRAY_SIZE(fsg_eth_npeb_resources),
-               .resource       = fsg_eth_npeb_resources,
-       }, {
-               .name                   = "ixp4xx_eth",
-               .id                     = IXP4XX_ETH_NPEC,
-               .dev = {
-                       .platform_data  = fsg_plat_eth + 1,
-               },
-               .num_resources  = ARRAY_SIZE(fsg_eth_npec_resources),
-               .resource       = fsg_eth_npec_resources,
-       }
-};
-
-static struct platform_device *fsg_devices[] __initdata = {
-       &fsg_i2c_gpio,
-       &fsg_flash,
-       &fsg_leds,
-       &fsg_eth[0],
-       &fsg_eth[1],
-};
-
-static irqreturn_t fsg_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 fsg_reset_handler(int irq, void *dev_id)
-{
-       /* This is the paper-clip reset which does an emergency reboot. */
-       printk(KERN_INFO "Restarting system.\n");
-       machine_restart(NULL);
-
-       /* This should never be reached. */
-       return IRQ_HANDLED;
-}
-
-static void __init fsg_init(void)
-{
-       uint8_t __iomem *f;
-
-       ixp4xx_sys_init();
-
-       fsg_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       fsg_flash_resource.end =
-               IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-
-       *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-       *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
-
-       /* Configure CS2 for operation, 8bit and writable */
-       *IXP4XX_EXP_CS2 = 0xbfff0002;
-
-       gpiod_add_lookup_table(&fsg_i2c_gpiod_table);
-       i2c_register_board_info(0, fsg_i2c_board_info,
-                               ARRAY_SIZE(fsg_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(&fsg_uart);
-
-       platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices));
-
-       if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler,
-                       IRQF_TRIGGER_LOW, "FSG reset button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
-                       gpio_to_irq(FSG_RB_GPIO));
-       }
-
-       if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler,
-                       IRQF_TRIGGER_LOW, "FSG power button", NULL) < 0) {
-
-               printk(KERN_DEBUG "Power Button IRQ %d not available\n",
-                       gpio_to_irq(FSG_SB_GPIO));
-       }
-
-       /*
-        * Map in a portion of the flash and read the MAC addresses.
-        * 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), 0x400000);
-       if (f) {
-#ifdef __ARMEB__
-               int i;
-               for (i = 0; i < 6; i++) {
-                       fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i);
-                       fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i);
-               }
-#else
-
-               /*
-                 Endian-swapped reads from unaligned addresses are
-                 required to extract the two MACs from the big-endian
-                 Redboot config area in flash.
-               */
-
-               fsg_plat_eth[0].hwaddr[0] = readb(f + 0x3C0421);
-               fsg_plat_eth[0].hwaddr[1] = readb(f + 0x3C0420);
-               fsg_plat_eth[0].hwaddr[2] = readb(f + 0x3C0427);
-               fsg_plat_eth[0].hwaddr[3] = readb(f + 0x3C0426);
-               fsg_plat_eth[0].hwaddr[4] = readb(f + 0x3C0425);
-               fsg_plat_eth[0].hwaddr[5] = readb(f + 0x3C0424);
-
-               fsg_plat_eth[1].hwaddr[0] = readb(f + 0x3C0439);
-               fsg_plat_eth[1].hwaddr[1] = readb(f + 0x3C043F);
-               fsg_plat_eth[1].hwaddr[2] = readb(f + 0x3C043E);
-               fsg_plat_eth[1].hwaddr[3] = readb(f + 0x3C043D);
-               fsg_plat_eth[1].hwaddr[4] = readb(f + 0x3C043C);
-               fsg_plat_eth[1].hwaddr[5] = readb(f + 0x3C0443);
-#endif
-               iounmap(f);
-       }
-       printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n",
-              fsg_plat_eth[0].hwaddr);
-       printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n",
-              fsg_plat_eth[1].hwaddr);
-
-}
-
-MACHINE_START(FSG, "Freecom FSG-3")
-       /* Maintainer: www.nslu2-linux.org */
-       .map_io         = ixp4xx_map_io,
-       .init_early     = ixp4xx_init_early,
-       .init_irq       = ixp4xx_init_irq,
-       .init_time      = ixp4xx_timer_init,
-       .atag_offset    = 0x100,
-       .init_machine   = fsg_init,
-#if defined(CONFIG_PCI)
-       .dma_zone_size  = SZ_64M,
-#endif
-       .restart        = ixp4xx_restart,
-MACHINE_END
-