|
|
@@ -1,47 +1,68 @@
|
|
|
+--- a/arch/arm/configs/ixp4xx_defconfig
|
|
|
++++ b/arch/arm/configs/ixp4xx_defconfig
|
|
|
+@@ -157,6 +157,8 @@
|
|
|
+ CONFIG_MACH_GATEWAY7001=y
|
|
|
+ CONFIG_MACH_WG302V1=y
|
|
|
+ CONFIG_MACH_WG302V2=y
|
|
|
++CONFIG_MACH_PRONGHORN=y
|
|
|
++CONFIG_MACH_PRONGHORNMETRO=y
|
|
|
+ CONFIG_ARCH_IXDP425=y
|
|
|
+ CONFIG_MACH_IXDPG425=y
|
|
|
+ CONFIG_MACH_IXDP465=y
|
|
|
--- a/arch/arm/mach-ixp4xx/Kconfig
|
|
|
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
|
|
-@@ -57,6 +57,14 @@
|
|
|
+@@ -65,6 +65,24 @@
|
|
|
WG302 v2 or WAG302 v2 Access Points. For more information
|
|
|
on this platform, see http://openwrt.org
|
|
|
|
|
|
-+config MACH_PRONGHORNMETRO
|
|
|
-+ bool "Pronghorn Metro"
|
|
|
++config MACH_PRONGHORN
|
|
|
++ bool "ADI Pronghorn series"
|
|
|
+ select PCI
|
|
|
+ help
|
|
|
+ Say 'Y' here if you want your kernel to support the ADI
|
|
|
-+ Engineering Pronghorn Metro Platform. For more
|
|
|
-+ information on this platform, see <file:Documentation/arm/IXP4xx>.
|
|
|
++ Engineering Pronghorn series. For more
|
|
|
++ information on this platform, see http://www.adiengineering.com
|
|
|
++
|
|
|
++#
|
|
|
++# There're only minimal differences kernel-wise between the Pronghorn and
|
|
|
++# Pronghorn Metro boards - they use different chip selects to drive the
|
|
|
++# CF slot connected to the expansion bus, so we just enable them together.
|
|
|
++#
|
|
|
++config MACH_PRONGHORNMETRO
|
|
|
++ bool
|
|
|
++ depends on MACH_PRONGHORN
|
|
|
++ default y
|
|
|
+
|
|
|
config ARCH_IXDP425
|
|
|
bool "IXDP425"
|
|
|
help
|
|
|
--- a/arch/arm/mach-ixp4xx/Makefile
|
|
|
+++ b/arch/arm/mach-ixp4xx/Makefile
|
|
|
-@@ -16,6 +16,7 @@
|
|
|
- obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
|
|
+@@ -17,6 +17,7 @@
|
|
|
+ obj-pci-$(CONFIG_MACH_WG302V1) += wg302v1-pci.o
|
|
|
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
|
|
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
|
|
-+obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
|
|
++obj-pci-$(CONFIG_MACH_PRONGHORN) += pronghorn-pci.o
|
|
|
|
|
|
obj-y += common.o
|
|
|
|
|
|
-@@ -30,6 +31,7 @@
|
|
|
- obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
|
|
+@@ -32,6 +33,7 @@
|
|
|
+ obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o
|
|
|
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
|
|
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
|
|
-+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
|
|
++obj-$(CONFIG_MACH_PRONGHORN) += pronghorn-setup.o
|
|
|
|
|
|
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
|
|
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
|
|
|
--- /dev/null
|
|
|
-+++ b/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
|
|
|
-@@ -0,0 +1,74 @@
|
|
|
++++ b/arch/arm/mach-ixp4xx/pronghorn-pci.c
|
|
|
+@@ -0,0 +1,70 @@
|
|
|
+/*
|
|
|
-+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
|
|
|
++ * arch/arch/mach-ixp4xx/pronghorn-pci.c
|
|
|
+ *
|
|
|
-+ * PCI setup routines for ADI Engineering Pronghorn Metro
|
|
|
++ * PCI setup routines for ADI Engineering Pronghorn series
|
|
|
+ *
|
|
|
-+ * Copyright (C) 2007 Imre Kaloz <[email protected]>
|
|
|
++ * Copyright (C) 2008 Imre Kaloz <[email protected]>
|
|
|
+ *
|
|
|
+ * based on coyote-pci.c:
|
|
|
+ * Copyright (C) 2002 Jungo Software Technologies.
|
|
|
@@ -62,15 +83,10 @@
|
|
|
+
|
|
|
+#include <asm/mach-types.h>
|
|
|
+#include <asm/hardware.h>
|
|
|
-+#include <asm/irq.h>
|
|
|
+
|
|
|
+#include <asm/mach/pci.h>
|
|
|
+
|
|
|
-+extern void ixp4xx_pci_preinit(void);
|
|
|
-+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
|
|
|
-+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
|
|
|
-+
|
|
|
-+void __init pronghornmetro_pci_preinit(void)
|
|
|
++void __init pronghorn_pci_preinit(void)
|
|
|
+{
|
|
|
+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_LOW);
|
|
|
+ set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
|
|
|
@@ -80,7 +96,7 @@
|
|
|
+ ixp4xx_pci_preinit();
|
|
|
+}
|
|
|
+
|
|
|
-+static int __init pronghornmetro_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
|
|
++static int __init pronghorn_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
|
|
+{
|
|
|
+ if (slot == 13)
|
|
|
+ return IRQ_IXP4XX_GPIO4;
|
|
|
@@ -90,35 +106,36 @@
|
|
|
+ return IRQ_IXP4XX_GPIO11;
|
|
|
+ else if (slot == 16)
|
|
|
+ return IRQ_IXP4XX_GPIO1;
|
|
|
-+ else return -1;
|
|
|
++ else
|
|
|
++ return -1;
|
|
|
+}
|
|
|
+
|
|
|
-+struct hw_pci pronghornmetro_pci __initdata = {
|
|
|
-+ .nr_controllers = 1,
|
|
|
-+ .preinit = pronghornmetro_pci_preinit,
|
|
|
-+ .swizzle = pci_std_swizzle,
|
|
|
-+ .setup = ixp4xx_setup,
|
|
|
-+ .scan = ixp4xx_scan_bus,
|
|
|
-+ .map_irq = pronghornmetro_map_irq,
|
|
|
++struct hw_pci pronghorn_pci __initdata = {
|
|
|
++ .nr_controllers = 1,
|
|
|
++ .preinit = pronghorn_pci_preinit,
|
|
|
++ .swizzle = pci_std_swizzle,
|
|
|
++ .setup = ixp4xx_setup,
|
|
|
++ .scan = ixp4xx_scan_bus,
|
|
|
++ .map_irq = pronghorn_map_irq,
|
|
|
+};
|
|
|
+
|
|
|
-+int __init pronghornmetro_pci_init(void)
|
|
|
++int __init pronghorn_pci_init(void)
|
|
|
+{
|
|
|
-+ if (machine_is_pronghorn_metro())
|
|
|
-+ pci_common_init(&pronghornmetro_pci);
|
|
|
++ if (machine_is_pronghorn() || machine_is_pronghorn_metro())
|
|
|
++ pci_common_init(&pronghorn_pci);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
-+subsys_initcall(pronghornmetro_pci_init);
|
|
|
++subsys_initcall(pronghorn_pci_init);
|
|
|
--- /dev/null
|
|
|
-+++ b/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
|
|
|
-@@ -0,0 +1,147 @@
|
|
|
++++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
|
|
|
+@@ -0,0 +1,245 @@
|
|
|
+/*
|
|
|
-+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
|
|
|
++ * arch/arm/mach-ixp4xx/pronghorn-setup.c
|
|
|
+ *
|
|
|
-+ * Board setup for the ADI Engineering Pronghorn Metro
|
|
|
++ * Board setup for the ADI Engineering Pronghorn series
|
|
|
+ *
|
|
|
-+ * Copyright (C) 2007 Imre Kaloz <[email protected]>
|
|
|
++ * Copyright (C) 2008 Imre Kaloz <[email protected]>
|
|
|
+ *
|
|
|
+ * based on coyote-setup.c:
|
|
|
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
|
|
@@ -133,42 +150,59 @@
|
|
|
+#include <linux/tty.h>
|
|
|
+#include <linux/serial_8250.h>
|
|
|
+#include <linux/slab.h>
|
|
|
++#include <linux/types.h>
|
|
|
++#include <linux/memory.h>
|
|
|
++#include <linux/i2c-gpio.h>
|
|
|
+
|
|
|
-+#include <asm/types.h>
|
|
|
+#include <asm/setup.h>
|
|
|
-+#include <asm/memory.h>
|
|
|
+#include <asm/hardware.h>
|
|
|
+#include <asm/irq.h>
|
|
|
+#include <asm/mach-types.h>
|
|
|
+#include <asm/mach/arch.h>
|
|
|
+#include <asm/mach/flash.h>
|
|
|
+
|
|
|
-+static struct flash_platform_data pronghornmetro_flash_data = {
|
|
|
++static struct flash_platform_data pronghorn_flash_data = {
|
|
|
+ .map_name = "cfi_probe",
|
|
|
+ .width = 2,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct resource pronghornmetro_flash_resource = {
|
|
|
++static struct resource pronghorn_flash_resource = {
|
|
|
+ .flags = IORESOURCE_MEM,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct platform_device pronghornmetro_flash = {
|
|
|
++static struct platform_device pronghorn_flash = {
|
|
|
+ .name = "IXP4XX-Flash",
|
|
|
+ .id = 0,
|
|
|
+ .dev = {
|
|
|
-+ .platform_data = &pronghornmetro_flash_data,
|
|
|
++ .platform_data = &pronghorn_flash_data,
|
|
|
+ },
|
|
|
+ .num_resources = 1,
|
|
|
-+ .resource = &pronghornmetro_flash_resource,
|
|
|
++ .resource = &pronghorn_flash_resource,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct resource pronghornmetro_uart_resource = {
|
|
|
-+ .start = IXP4XX_UART2_BASE_PHYS,
|
|
|
-+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
|
|
-+ .flags = IORESOURCE_MEM,
|
|
|
++static struct resource pronghorn_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 pronghornmetro_uart_data[] = {
|
|
|
++static struct plat_serial8250_port pronghorn_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,
|
|
|
@@ -181,17 +215,49 @@
|
|
|
+ { },
|
|
|
+};
|
|
|
+
|
|
|
-+static struct platform_device pronghornmetro_uart = {
|
|
|
++static struct platform_device pronghorn_uart = {
|
|
|
+ .name = "serial8250",
|
|
|
+ .id = PLAT8250_DEV_PLATFORM,
|
|
|
-+ .dev = {
|
|
|
-+ .platform_data = pronghornmetro_uart_data,
|
|
|
++ .dev = {
|
|
|
++ .platform_data = pronghorn_uart_data,
|
|
|
+ },
|
|
|
-+ .num_resources = 1,
|
|
|
-+ .resource = &pronghornmetro_uart_resource,
|
|
|
++ .num_resources = 2,
|
|
|
++ .resource = pronghorn_uart_resources,
|
|
|
++};
|
|
|
++
|
|
|
++static struct i2c_gpio_platform_data pronghorn_i2c_gpio_data = {
|
|
|
++ .sda_pin = 9,
|
|
|
++ .scl_pin = 10,
|
|
|
++};
|
|
|
++
|
|
|
++static struct platform_device pronghorn_i2c_gpio = {
|
|
|
++ .name = "i2c-gpio",
|
|
|
++ .id = 0,
|
|
|
++ .dev = {
|
|
|
++ .platform_data = &pronghorn_i2c_gpio_data,
|
|
|
++ },
|
|
|
++};
|
|
|
++
|
|
|
++static struct gpio_led pronghorn_led_pin[] = {
|
|
|
++ {
|
|
|
++ .name = "pronghorn:green:status",
|
|
|
++ .gpio = 7,
|
|
|
++ },
|
|
|
++ { },
|
|
|
++};
|
|
|
++
|
|
|
++static struct gpio_led_platform_data pronghorn_led_data = {
|
|
|
++ .num_leds = ARRAY_SIZE(pronghorn_led_pin),
|
|
|
++ .leds = pronghorn_led_pin,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct resource pronghornmetro_pata_resources[] = {
|
|
|
++static struct platform_device pronghorn_led = {
|
|
|
++ .name = "leds-gpio",
|
|
|
++ .id = -1,
|
|
|
++ .dev.platform_data = &pronghorn_led_data,
|
|
|
++};
|
|
|
++
|
|
|
++static struct resource pronghorn_pata_resources[] = {
|
|
|
+ {
|
|
|
+ .flags = IORESOURCE_MEM
|
|
|
+ },
|
|
|
@@ -206,50 +272,89 @@
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
-+static struct ixp4xx_pata_data pronghornmetro_pata_data = {
|
|
|
++static struct ixp4xx_pata_data pronghorn_pata_data = {
|
|
|
+ .cs0_bits = 0xbfff0043,
|
|
|
+ .cs1_bits = 0xbfff0043,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct platform_device pronghornmetro_pata = {
|
|
|
++static struct platform_device pronghorn_pata = {
|
|
|
+ .name = "pata_ixp4xx_cf",
|
|
|
+ .id = 0,
|
|
|
-+ .dev.platform_data = &pronghornmetro_pata_data,
|
|
|
-+ .num_resources = ARRAY_SIZE(pronghornmetro_pata_resources),
|
|
|
-+ .resource = pronghornmetro_pata_resources,
|
|
|
++ .dev.platform_data = &pronghorn_pata_data,
|
|
|
++ .num_resources = ARRAY_SIZE(pronghorn_pata_resources),
|
|
|
++ .resource = pronghorn_pata_resources,
|
|
|
+};
|
|
|
+
|
|
|
-+static struct platform_device *pronghornmetro_devices[] __initdata = {
|
|
|
-+ &pronghornmetro_flash,
|
|
|
-+ &pronghornmetro_uart,
|
|
|
++static struct eth_plat_info pronghorn_plat_eth[] = {
|
|
|
++ {
|
|
|
++ .phy = 0,
|
|
|
++ .rxq = 3,
|
|
|
++ .txreadyq = 20,
|
|
|
++ }, {
|
|
|
++ .phy = 1,
|
|
|
++ .rxq = 4,
|
|
|
++ .txreadyq = 21,
|
|
|
++ }
|
|
|
+};
|
|
|
+
|
|
|
-+static void __init pronghornmetro_init(void)
|
|
|
++static struct platform_device pronghorn_eth[] = {
|
|
|
++ {
|
|
|
++ .name = "ixp4xx_eth",
|
|
|
++ .id = IXP4XX_ETH_NPEB,
|
|
|
++ .dev.platform_data = pronghorn_plat_eth,
|
|
|
++ }, {
|
|
|
++ .name = "ixp4xx_eth",
|
|
|
++ .id = IXP4XX_ETH_NPEC,
|
|
|
++ .dev.platform_data = pronghorn_plat_eth + 1,
|
|
|
++ }
|
|
|
++};
|
|
|
++
|
|
|
++static struct platform_device *pronghorn_devices[] __initdata = {
|
|
|
++ &pronghorn_flash,
|
|
|
++ &pronghorn_uart,
|
|
|
++ &pronghorn_led,
|
|
|
++ &pronghorn_eth[0],
|
|
|
++ &pronghorn_eth[1],
|
|
|
++};
|
|
|
++
|
|
|
++static void __init pronghorn_init(void)
|
|
|
+{
|
|
|
+ ixp4xx_sys_init();
|
|
|
+
|
|
|
-+ pronghornmetro_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
|
|
-+ pronghornmetro_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
|
|
|
++ pronghorn_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
|
|
++ pronghorn_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
|
|
|
+
|
|
|
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
|
|
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
|
|
+
|
|
|
-+ platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
|
|
|
++ platform_add_devices(pronghorn_devices, ARRAY_SIZE(pronghorn_devices));
|
|
|
++
|
|
|
++ if (machine_is_pronghorn()) {
|
|
|
++ pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
|
|
|
++ pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
|
|
|
++
|
|
|
++ pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
|
|
|
++ pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
|
|
|
+
|
|
|
-+ pronghornmetro_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
|
|
|
-+ pronghornmetro_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
|
|
|
++ pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
|
|
|
++ pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
|
|
|
++ } else {
|
|
|
++ pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2);
|
|
|
++ pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(2);
|
|
|
+
|
|
|
-+ pronghornmetro_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
|
|
|
-+ pronghornmetro_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
|
|
|
++ pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(3);
|
|
|
++ pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(3);
|
|
|
+
|
|
|
-+ pronghornmetro_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
|
|
|
-+ pronghornmetro_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
|
|
|
++ pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS2;
|
|
|
++ pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
|
|
|
+
|
|
|
-+ platform_device_register(&pronghornmetro_pata);
|
|
|
++ platform_device_register(&pronghorn_i2c_gpio);
|
|
|
++ }
|
|
|
++
|
|
|
++ platform_device_register(&pronghorn_pata);
|
|
|
+}
|
|
|
+
|
|
|
-+#ifdef CONFIG_MACH_PRONGHORNMETRO
|
|
|
-+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
|
|
|
++MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn")
|
|
|
+ /* Maintainer: Imre Kaloz <[email protected]> */
|
|
|
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
|
|
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
|
|
@@ -257,21 +362,19 @@
|
|
|
+ .init_irq = ixp4xx_init_irq,
|
|
|
+ .timer = &ixp4xx_timer,
|
|
|
+ .boot_params = 0x0100,
|
|
|
-+ .init_machine = pronghornmetro_init,
|
|
|
++ .init_machine = pronghorn_init,
|
|
|
+MACHINE_END
|
|
|
-+#endif
|
|
|
---- a/Documentation/arm/IXP4xx
|
|
|
-+++ b/Documentation/arm/IXP4xx
|
|
|
-@@ -111,6 +111,9 @@
|
|
|
- the platform has two mini-PCI slots used for 802.11[bga] cards.
|
|
|
- Finally, there is an IDE port hanging off the expansion bus.
|
|
|
-
|
|
|
-+ADI Engineering Pronghorn Metro Platform
|
|
|
-+http://www.adiengineering.com/php-bin/ecomm4/productDisplay.php?category_id=30&product_id=85
|
|
|
+
|
|
|
- Gateworks Avila Network Platform
|
|
|
- http://www.gateworks.com/avila_sbc.htm
|
|
|
-
|
|
|
++MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
|
|
|
++ /* Maintainer: Imre Kaloz <[email protected]> */
|
|
|
++ .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 = pronghorn_init,
|
|
|
++MACHINE_END
|
|
|
--- a/include/asm-arm/arch-ixp4xx/uncompress.h
|
|
|
+++ b/include/asm-arm/arch-ixp4xx/uncompress.h
|
|
|
@@ -41,7 +41,8 @@
|
|
|
@@ -280,7 +383,7 @@
|
|
|
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
|
|
|
- machine_is_gateway7001() || machine_is_wg302v2())
|
|
|
+ machine_is_gateway7001() || machine_is_wg302v2() ||
|
|
|
-+ machine_is_pronghorn_metro())
|
|
|
++ machine_is_pronghorn() || machine_is_pronghorn_metro())
|
|
|
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
|
|
|
else
|
|
|
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
|
Imre Kaloz