[ARM] 4874/2: ixp4xx: Add support for the Freecom FSG-3 board (7e36e2f5) · Commits · 戴 / test

arch/arm/configs/ixp4xx_defconfig

+5 −4

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
		CONFIG_MACH_NAS100D=y
		CONFIG_MACH_DSMG600=y
		CONFIG_ARCH_IXDP4XX=y
		CONFIG_MACH_FSG=y
		CONFIG_CPU_IXP46X=y
		CONFIG_CPU_IXP43X=y
		CONFIG_MACH_GTWX5715=y
		@@ -770,7 +771,7 @@ CONFIG_ATA=y
		# CONFIG_SATA_SIL24 is not set
		# CONFIG_SATA_SIS is not set
		# CONFIG_SATA_ULI is not set
		# CONFIG_SATA_VIA is not set
		CONFIG_SATA_VIA=y
		# CONFIG_SATA_VITESSE is not set
		# CONFIG_SATA_INIC162X is not set
		# CONFIG_PATA_ALI is not set
		@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_VIA686A is not set
		# CONFIG_SENSORS_VT1211 is not set
		# CONFIG_SENSORS_VT8231 is not set
		# CONFIG_SENSORS_W83781D is not set
		CONFIG_SENSORS_W83781D=y
		# CONFIG_SENSORS_W83791D is not set
		# CONFIG_SENSORS_W83792D is not set
		# CONFIG_SENSORS_W83793 is not set
		@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y
		#
		# LED drivers
		#
		# CONFIG_LEDS_IXP4XX is not set
		CONFIG_LEDS_GPIO=y
		CONFIG_LEDS_FSG=y

		#
		# LED Triggers
		@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y
		# CONFIG_RTC_DRV_DS1672 is not set
		# CONFIG_RTC_DRV_MAX6900 is not set
		# CONFIG_RTC_DRV_RS5C372 is not set
		# CONFIG_RTC_DRV_ISL1208 is not set
		CONFIG_RTC_DRV_ISL1208=y
		CONFIG_RTC_DRV_X1205=y
		CONFIG_RTC_DRV_PCF8563=y
		# CONFIG_RTC_DRV_PCF8583 is not set

arch/arm/mach-ixp4xx/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
		depends on ARCH_IXDP425 \|\| MACH_IXDP465 \|\| MACH_KIXRP435
		default y

		config MACH_FSG
		bool
		prompt "Freecom FSG-3"
		select PCI
		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
		#

arch/arm/mach-ixp4xx/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ 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
		obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o

		obj-y += common.o

		@@ -28,6 +29,7 @@ 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
		obj-$(CONFIG_MACH_FSG) += fsg-setup.o

		obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
		obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o

arch/arm/mach-ixp4xx/fsg-pci.c

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*
		* 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 <linux/pci.h>
		#include <linux/init.h>
		#include <linux/irq.h>

		#include <asm/mach/pci.h>
		#include <asm/mach-types.h>

		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(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,
		.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);

arch/arm/mach-ixp4xx/fsg-setup.c

0 → 100644

+276 −0

Original line number	Diff line number	Diff line
		/*
		* 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/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/i2c-gpio.h>

		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/flash.h>
		#include <asm/io.h>
		#include <asm/gpio.h>

		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 i2c_gpio_platform_data fsg_i2c_gpio_data = {
		.sda_pin = FSG_SDA_PIN,
		.scl_pin = FSG_SCL_PIN,
		};

		static struct platform_device fsg_i2c_gpio = {
		.name = "i2c-gpio",
		.id = 0,
		.dev = {
		.platform_data = &fsg_i2c_gpio_data,
		},
		};

		static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
		{
		I2C_BOARD_INFO("rtc-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 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,
		},
		}, {
		.name = "ixp4xx_eth",
		.id = IXP4XX_ETH_NPEC,
		.dev = {
		.platform_data = fsg_plat_eth + 1,
		},
		}
		};

		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)
		{
		DECLARE_MAC_BUF(mac_buf);
		uint8_t __iomem *f;
		int i;

		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;

		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_DISABLED \| 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_DISABLED \| 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__
		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 %s for port 0\n",
		print_mac(mac_buf, fsg_plat_eth[0].hwaddr));
		printk(KERN_INFO "FSG: Using MAC address %s for port 1\n",
		print_mac(mac_buf, fsg_plat_eth[1].hwaddr));

		}

		MACHINE_START(FSG, "Freecom FSG-3")
		/* Maintainer: www.nslu2-linux.org */
		.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

Admin message