|
|
@@ -0,0 +1,180 @@
|
|
|
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c
|
|
|
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-10 01:56:21.000000000 +0200
|
|
|
+@@ -0,0 +1,120 @@
|
|
|
++/*
|
|
|
++ * arch/arm/mach-ixp4xx/compex-setup.c
|
|
|
++ *
|
|
|
++ * Ccompex WP18 / NP18A board-setup
|
|
|
++ *
|
|
|
++ * Copyright (C) 2007 Imre Kaloz <[email protected]>
|
|
|
++ *
|
|
|
++ * based on ixdp425-setup.c:
|
|
|
++ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
|
|
++ *
|
|
|
++ * Author: Imre Kaloz <[email protected]>
|
|
|
++ */
|
|
|
++
|
|
|
++#include <linux/kernel.h>
|
|
|
++#include <linux/init.h>
|
|
|
++#include <linux/device.h>
|
|
|
++#include <linux/serial.h>
|
|
|
++#include <linux/tty.h>
|
|
|
++#include <linux/serial_8250.h>
|
|
|
++#include <linux/slab.h>
|
|
|
++
|
|
|
++#include <asm/types.h>
|
|
|
++#include <asm/setup.h>
|
|
|
++#include <asm/memory.h>
|
|
|
++#include <asm/hardware.h>
|
|
|
++#include <asm/mach-types.h>
|
|
|
++#include <asm/irq.h>
|
|
|
++#include <asm/mach/arch.h>
|
|
|
++#include <asm/mach/flash.h>
|
|
|
++
|
|
|
++static struct flash_platform_data compex_flash_data = {
|
|
|
++ .map_name = "cfi_probe",
|
|
|
++ .width = 2,
|
|
|
++};
|
|
|
++
|
|
|
++static struct resource compex_flash_resource = {
|
|
|
++ .flags = IORESOURCE_MEM,
|
|
|
++};
|
|
|
++
|
|
|
++static struct platform_device compex_flash = {
|
|
|
++ .name = "IXP4XX-Flash",
|
|
|
++ .id = 0,
|
|
|
++ .dev = {
|
|
|
++ .platform_data = &compex_flash_data,
|
|
|
++ },
|
|
|
++ .num_resources = 1,
|
|
|
++ .resource = &compex_flash_resource,
|
|
|
++};
|
|
|
++
|
|
|
++static struct resource compex_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 compex_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 compex_uart = {
|
|
|
++ .name = "serial8250",
|
|
|
++ .id = PLAT8250_DEV_PLATFORM,
|
|
|
++ .dev.platform_data = compex_uart_data,
|
|
|
++ .num_resources = 2,
|
|
|
++ .resource = compex_uart_resources
|
|
|
++};
|
|
|
++
|
|
|
++static struct platform_device *compex_devices[] __initdata = {
|
|
|
++ &compex_flash,
|
|
|
++ &compex_uart
|
|
|
++};
|
|
|
++
|
|
|
++static void __init compex_init(void)
|
|
|
++{
|
|
|
++ ixp4xx_sys_init();
|
|
|
++
|
|
|
++ compex_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
|
|
++ compex_flash_resource.end =
|
|
|
++ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
|
|
|
++
|
|
|
++ platform_add_devices(compex_devices, ARRAY_SIZE(compex_devices));
|
|
|
++}
|
|
|
++
|
|
|
++#ifdef CONFIG_MACH_COMPEX
|
|
|
++MACHINE_START(COMPEX, "Compex WP18 / NP18A")
|
|
|
++ /* 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 = compex_init,
|
|
|
++MACHINE_END
|
|
|
++#endif
|
|
|
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
|
|
|
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-01-10 20:10:37.000000000 +0100
|
|
|
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-10 00:22:16.000000000 +0200
|
|
|
+@@ -66,7 +66,7 @@
|
|
|
+ int __init ixdp425_pci_init(void)
|
|
|
+ {
|
|
|
+ if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
|
|
|
+- machine_is_avila() || machine_is_ixdp465())
|
|
|
++ machine_is_avila() || machine_is_ixdp465() || machine_is_compex())
|
|
|
+ pci_common_init(&ixdp425_pci);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
|
|
|
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:33:31.000000000 +0200
|
|
|
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:48:37.000000000 +0200
|
|
|
+@@ -57,6 +57,14 @@
|
|
|
+ Engineering Pronghorn Metro Platform. For more
|
|
|
+ information on this platform, see <file:Documentation/arm/IXP4xx>.
|
|
|
+
|
|
|
++config MACH_COMPEX
|
|
|
++ bool "Compex WP18 / NP18A"
|
|
|
++ select PCI
|
|
|
++ help
|
|
|
++ Say 'Y' here if you want your kernel to support Compex'
|
|
|
++ WP18 or NP18A boards. For more information on this
|
|
|
++ platform, see http://openwrt.org
|
|
|
++
|
|
|
+ config ARCH_IXDP425
|
|
|
+ bool "IXDP425"
|
|
|
+ help
|
|
|
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile
|
|
|
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-10 00:33:39.000000000 +0200
|
|
|
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-09 20:23:06.000000000 +0200
|
|
|
+@@ -14,6 +14,7 @@
|
|
|
+ obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
|
|
+ obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
|
|
+ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
|
|
++obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
|
|
+
|
|
|
+ obj-y += common.o
|
|
|
+
|
|
|
+@@ -26,5 +27,6 @@
|
|
|
+ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
|
|
+ obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
|
|
+ obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
|
|
++obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
|
|
+
|
|
|
+ obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
|
|
+diff -Nur linux-2.6.19.2/arch/arm/tools/mach-types linux-2.6.19.2-owrt/arch/arm/tools/mach-types
|
|
|
+--- linux-2.6.19.2/arch/arm/tools/mach-types 2007-04-10 01:27:55.000000000 +0200
|
|
|
++++ linux-2.6.19.2-owrt/arch/arm/tools/mach-types 2007-04-09 20:22:33.000000000 +0200
|
|
|
+@@ -1171,3 +1171,4 @@
|
|
|
+ cdcs_quoll MACH_CDCS_QUOLL CDCS_QUOLL 1158
|
|
|
+ quicksilver MACH_QUICKSILVER QUICKSILVER 1159
|
|
|
+ uplat926 MACH_UPLAT926 UPLAT926 1160
|
|
|
++compex MACH_COMPEX COMPEX 1273
|
Imre Kaloz