From: Rod Whitby Date: Wed, 11 Jul 2007 13:16:14 +0000 (+0000) Subject: ixp4xx: Add initial support for the Freecom FSG-3 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04673803b549e7abc580acb012ad9fb30764ef8b;p=openwrt%2Fstaging%2Fjow.git ixp4xx: Add initial support for the Freecom FSG-3 SVN-Revision: 7919 --- diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default index 8c8196ceed..06153aa03f 100644 --- a/target/linux/ixp4xx-2.6/config/default +++ b/target/linux/ixp4xx-2.6/config/default @@ -225,6 +225,7 @@ CONFIG_LEGACY_PTY_COUNT=256 CONFIG_MACH_AVILA=y CONFIG_MACH_COMPEX=y CONFIG_MACH_DSMG600=y +CONFIG_MACH_FSG=y CONFIG_MACH_GATEWAY7001=y # CONFIG_MACH_GTWX5715 is not set # CONFIG_MACH_IXDP465 is not set diff --git a/target/linux/ixp4xx-2.6/patches/996-fsg3_support.patch b/target/linux/ixp4xx-2.6/patches/996-fsg3_support.patch new file mode 100644 index 0000000000..ecf5d750a5 --- /dev/null +++ b/target/linux/ixp4xx-2.6/patches/996-fsg3_support.patch @@ -0,0 +1,429 @@ +Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +@@ -0,0 +1,71 @@ ++/* ++ * arch/arch/mach-ixp4xx/fsg-pci.c ++ * ++ * FSG board-level PCI initialization ++ * ++ * Author: Rod Whitby ++ * Maintainer: http://www.nslu2-linux.org/ ++ * ++ * based on ixdp425-pci.c: ++ * Copyright (C) 2002 Intel Corporation. ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++void __init fsg_pci_preinit(void) ++{ ++ set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW); ++ set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW); ++ set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW); ++ ++ ixp4xx_pci_preinit(); ++} ++ ++static int __init fsg_map_irq(struct pci_dev *dev, u8 slot, u8 pin) ++{ ++ static int pci_irq_table[FSG_PCI_IRQ_LINES] = { ++ IRQ_FSG_PCI_INTC, ++ IRQ_FSG_PCI_INTB, ++ IRQ_FSG_PCI_INTA, ++ }; ++ ++ int irq = -1; ++ slot = slot - 11; ++ ++ if (slot >= 1 && slot <= FSG_PCI_MAX_DEV && ++ pin >= 1 && pin <= FSG_PCI_IRQ_LINES) { ++ irq = pci_irq_table[(slot - 1)]; ++ } ++ printk("%s: Mapped slot %d pin %d to IRQ %d\n", __FUNCTION__,slot, pin, irq); ++ ++ return irq; ++} ++ ++struct hw_pci fsg_pci __initdata = { ++ .nr_controllers = 1, ++ .preinit = fsg_pci_preinit, ++ .swizzle = pci_std_swizzle, ++ .setup = ixp4xx_setup, ++ .scan = ixp4xx_scan_bus, ++ .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); +Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c +@@ -0,0 +1,223 @@ ++/* ++ * arch/arm/mach-ixp4xx/fsg-setup.c ++ * ++ * FSG board-setup ++ * ++ * based ixdp425-setup.c: ++ * Copyright (C) 2003-2004 MontaVista Software, Inc. ++ * ++ * Author: Rod Whitby ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++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 ixp4xx_i2c_pins fsg_i2c_gpio_pins = { ++ .sda_pin = FSG_SDA_PIN, ++ .scl_pin = FSG_SCL_PIN, ++}; ++ ++static struct platform_device fsg_i2c_controller = { ++ .name = "IXP4XX-I2C", ++ .id = 0, ++ .dev.platform_data = &fsg_i2c_gpio_pins, ++ .num_resources = 0, ++}; ++ ++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, ++}; ++ ++/* Built-in 10/100 Ethernet MAC interfaces */ ++static struct resource res_mac0 = { ++ .start = IXP4XX_EthB_BASE_PHYS, ++ .end = IXP4XX_EthB_BASE_PHYS + 0x1ff, ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct resource res_mac1 = { ++ .start = IXP4XX_EthC_BASE_PHYS, ++ .end = IXP4XX_EthC_BASE_PHYS + 0x1ff, ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct mac_plat_info plat_mac0 = { ++ .npe_id = 1, ++ .phy_id = 5, ++ .eth_id = 0, ++ .rxq_id = 27, ++ .txq_id = 24, ++ .rxdoneq_id = 4, ++}; ++ ++static struct mac_plat_info plat_mac1 = { ++ .npe_id = 2, ++ .phy_id = 4, ++ .eth_id = 1, ++ .rxq_id = 28, ++ .txq_id = 25, ++ .rxdoneq_id = 5, ++}; ++ ++static struct platform_device mac0 = { ++ .name = "ixp4xx_mac", ++ .id = 0, ++ .dev.platform_data = &plat_mac0, ++ .num_resources = 1, ++ .resource = &res_mac0, ++}; ++ ++static struct platform_device mac1 = { ++ .name = "ixp4xx_mac", ++ .id = 1, ++ .dev.platform_data = &plat_mac1, ++ .num_resources = 1, ++ .resource = &res_mac1, ++}; ++ ++struct npe_ucode_platform_data fsg_npe_ucode_data = { ++ .mtd_partition = "microcode", ++}; ++ ++static struct platform_device fsg_npe_ucode = { ++ .name = "ixp4xx_npe_ucode", ++ .id = 0, ++ .dev.platform_data = &fsg_npe_ucode_data, ++}; ++ ++static struct platform_device *fsg_devices[] __initdata = { ++ &fsg_i2c_controller, ++ &fsg_flash, ++ &mac0, ++ &mac1, ++ &fsg_npe_ucode, ++}; ++ ++static void fsg_flash_add(struct mtd_info *mtd) ++{ ++ if (strcmp(mtd->name, "RedBoot config") == 0) { ++ size_t retlen; ++ u_char mac[6]; ++ ++ if (mtd->read(mtd, 0x0422, 6, &retlen, mac) == 0 && retlen == 6) { ++ printk(KERN_INFO "eth0 mac: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ memcpy(plat_mac0.hwaddr, mac, 6); ++ mac[5]++; ++ printk(KERN_INFO "eth1 mac: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ memcpy(plat_mac1.hwaddr, mac, 6); ++ } else { ++ printk(KERN_ERR "fsg mac: read failed\n"); ++ } ++ } ++} ++ ++static void fsg_flash_remove(struct mtd_info *mtd) { ++} ++ ++static struct mtd_notifier fsg_flash_notifier = { ++ .add = fsg_flash_add, ++ .remove = fsg_flash_remove, ++}; ++ ++static void __init fsg_init(void) ++{ ++ 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; ++ ++ /* 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)); ++ ++ register_mtd_user(&fsg_flash_notifier); ++} ++ ++MACHINE_START(FSG, "Freecom FSG-3") ++ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, ++ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, ++ .map_io = ixp4xx_map_io, ++ .init_irq = ixp4xx_init_irq, ++ .timer = &ixp4xx_timer, ++ .boot_params = 0x0100, ++ .init_machine = fsg_init, ++MACHINE_END ++ +Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h +=================================================================== +--- /dev/null ++++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h +@@ -0,0 +1,58 @@ ++/* ++ * include/asm-arm/arch-ixp4xx/fsg.h ++ * ++ * Freecom FSG-3 platform specific definitions ++ * ++ * Author: Rod Whitby ++ * Author: Tomasz Chmielewski ++ * Maintainers: http://www.nslu2-linux.org ++ * ++ * Based on coyote.h by ++ * Copyright 2004 (c) MontaVista, Software, Inc. ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#ifndef __ASM_ARCH_HARDWARE_H__ ++#error "Do not include this directly, instead #include " ++#endif ++ ++#define FSG_SDA_PIN 12 ++#define FSG_SCL_PIN 13 ++ ++/* ++ * FSG PCI IRQs ++ */ ++#define FSG_PCI_MAX_DEV 3 ++#define FSG_PCI_IRQ_LINES 3 ++ ++ ++/* PCI controller GPIO to IRQ pin mappings */ ++#define FSG_PCI_INTA_PIN 6 ++#define FSG_PCI_INTB_PIN 7 ++#define FSG_PCI_INTC_PIN 5 ++ ++/* Buttons */ ++ ++#define FSG_SB_GPIO 4 ++#define FSG_RB_GPIO 9 ++#define FSG_UB_GPIO 10 ++ ++#define FSG_SB_IRQ IRQ_IXP4XX_GPIO4 ++#define FSG_RB_IRQ IRQ_IXP4XX_GPIO9 ++#define FSG_UB_IRQ IRQ_IXP4XX_GPIO10 ++ ++#define FSG_SB_BM (1L << FSG_SB_GPIO) ++#define FSG_RB_BM (1L << FSG_RB_GPIO) ++#define FSG_UB_BM (1L << FSG_UB_GPIO) ++ ++/* LEDs */ ++ ++#define FSG_LED_RING_BIT 0 ++#define FSG_LED_SYNC_BIT 1 ++#define FSG_LED_USB_BIT 2 ++#define FSG_LED_SATA_BIT 3 ++#define FSG_LED_WAN_BIT 4 ++#define FSG_LED_WLAN_BIT 5 +Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h +@@ -48,5 +48,6 @@ extern unsigned int processor_id; + #include "nslu2.h" + #include "nas100d.h" + #include "dsmg600.h" ++#include "fsg.h" + + #endif /* _ASM_ARCH_HARDWARE_H */ +Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h +=================================================================== +--- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h +@@ -128,4 +128,11 @@ + #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 + #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 + ++/* ++ * Freecom FSG-3 board IRQs ++ */ ++#define IRQ_FSG_PCI_INTA IRQ_IXP4XX_GPIO6 ++#define IRQ_FSG_PCI_INTB IRQ_IXP4XX_GPIO7 ++#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 ++ + #endif +--- linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile~ 2007-07-11 22:20:52.000000000 +0930 ++++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile 2007-07-11 22:22:02.000000000 +0930 +@@ -13,6 +13,7 @@ + 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_FSG) += fsg-pci.o + obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o + obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o + obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o +@@ -29,6 +30,7 @@ + obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o + obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o + obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o ++obj-$(CONFIG_MACH_FSG) += fsg-setup.o + obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o + obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o + obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o +--- linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig~ 2007-07-11 22:23:24.000000000 +0930 ++++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig 2007-07-11 22:23:47.000000000 +0930 +@@ -138,6 +138,14 @@ + DSM-G600 RevA device. For more information on this platform, + see http://www.nslu2-linux.org/wiki/DSMG600/HomePage + ++config MACH_FSG ++ bool ++ prompt "Freecom FSG-3" ++ 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.openfsg.com/ ++ + # + # Avila and IXDP share the same source for now. Will change in future + #