projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add a better pci fix for rb532
[openwrt.git] / target / linux / ixp4xx-2.6 / patches / 200-gateway_7001.patch
diff --git a/target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch b/target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch
index 49aefda..6d2f521 100644 (file)
--- a/target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch
+++ b/target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch
@@ -1,7 +1,7 @@
-diff -Nur linux-2.6.17/arch/arm/boot/compressed/head-xscale.S linux-2.6.17-owrt/arch/arm/boot/compressed/head-xscale.S
---- linux-2.6.17/arch/arm/boot/compressed/head-xscale.S        2006-09-11 12:29:51.000000000 +0200
-+++ linux-2.6.17-owrt/arch/arm/boot/compressed/head-xscale.S   2006-09-11 12:30:03.000000000 +0200
-@@ -47,6 +47,11 @@
+diff -Nur linux-2.6.19/arch/arm/boot/compressed/head-xscale.S linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S
+--- linux-2.6.19/arch/arm/boot/compressed/head-xscale.S        2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S   2006-12-19 13:17:38.000000000 +0100
+@@ -46,6 +46,11 @@
                 orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
  #endif
  
@@ -13,10 +13,104 @@ diff -Nur linux-2.6.17/arch/arm/boot/compressed/head-xscale.S linux-2.6.17-owrt/
  #ifdef CONFIG_ARCH_IXP2000
                mov     r1, #-1
                mov     r0, #0xd6000000
-diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.17-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c
---- linux-2.6.17/arch/arm/mach-ixp4xx/gateway7001-pci.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c   2006-09-11 12:30:03.000000000 +0200
-@@ -0,0 +1,67 @@
+diff -Nur linux-2.6.19/arch/arm/mach-ixp4xx/coyote-setup.c linux-2.6.19-owrt/arch/arm/mach-ixp4xx/coyote-setup.c
+--- linux-2.6.19/arch/arm/mach-ixp4xx/coyote-setup.c   2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19-owrt/arch/arm/mach-ixp4xx/coyote-setup.c      2006-12-19 13:17:38.000000000 +0100
+@@ -1,9 +1,10 @@
+ /*
+  * arch/arm/mach-ixp4xx/coyote-setup.c
+  *
+- * Board setup for ADI Engineering and IXDGP425 boards
++ * Board setup for ADI Engineering, IXDGP425 and Gateway 7001 boards
+  *
+  * Copyright (C) 2003-2005 MontaVista Software, Inc.
++ * Copyright (C) 2006 Imre Kaloz <Kaloz@openwrt.org>
+  *
+  * Author: Deepak Saxena <dsaxena@plexity.net>
+  */
+@@ -73,9 +74,57 @@
+       .resource       = &coyote_uart_resource,
+ };
+ 
++/* MACs */
++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         = 0,
++      .eth_id         = 0,
++      .rxq_id         = 27,
++      .txq_id         = 24,
++};
++
++static struct mac_plat_info plat_mac1 = {
++      .npe_id         = 2,
++      .phy_id         = 1,
++      .eth_id         = 1,
++      .rxq_id         = 28,
++      .txq_id         = 25,
++};
++
++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,
++};
++
++
+ static struct platform_device *coyote_devices[] __initdata = {
+       &coyote_flash,
+-      &coyote_uart
++      &coyote_uart,
++      &mac0,
++      &mac1
+ };
+ 
+ static void __init coyote_init(void)
+@@ -111,6 +160,19 @@
+ MACHINE_END
+ #endif
+ 
++#ifdef CONFIG_MACH_GATEWAY7001
++MACHINE_START(GATEWAY7001, "Gateway 7001")
++      /* Maintainer: Imre Kaloz <kaloz@openwrt.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   = coyote_init,
++MACHINE_END
++#endif
++
+ /*
+  * IXDPG425 is identical to Coyote except for which serial port
+  * is connected.
+diff -Nur linux-2.6.19/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.19-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c
+--- linux-2.6.19/arch/arm/mach-ixp4xx/gateway7001-pci.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c   2006-12-19 13:18:18.000000000 +0100
+@@ -0,0 +1,68 @@
 +/*
 + * arch/arch/mach-ixp4xx/gateway7001-pci.c
 + *
@@ -39,6 +133,7 @@ diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.17-owrt/
 +#include <linux/kernel.h>
 +#include <linux/pci.h>
 +#include <linux/init.h>
++#include <linux/irq.h>
 +
 +#include <asm/mach-types.h>
 +#include <asm/hardware.h>
@@ -84,9 +179,9 @@ diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.17-owrt/
 +}
 +
 +subsys_initcall(gateway7001_pci_init);
-diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/Kconfig linux-2.6.17-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.17/arch/arm/mach-ixp4xx/Kconfig  2006-09-11 12:29:51.000000000 +0200
-+++ linux-2.6.17-owrt/arch/arm/mach-ixp4xx/Kconfig     2006-09-11 12:30:03.000000000 +0200
+diff -Nur linux-2.6.19/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19-owrt/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.19/arch/arm/mach-ixp4xx/Kconfig  2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19-owrt/arch/arm/mach-ixp4xx/Kconfig     2006-12-19 13:17:38.000000000 +0100
 @@ -33,6 +33,14 @@
          Engineering Coyote Gateway Reference Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -101,19 +196,20 @@ diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/Kconfig linux-2.6.17-owrt/arch/arm/m
 +
  config ARCH_IXDP425
        bool "IXDP425"
-       select PCI
-diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/Makefile linux-2.6.17-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.17/arch/arm/mach-ixp4xx/Makefile 2006-09-11 12:29:51.000000000 +0200
-+++ linux-2.6.17-owrt/arch/arm/mach-ixp4xx/Makefile    2006-09-11 12:30:03.000000000 +0200
-@@ -11,4 +11,5 @@
- obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-pci.o gtwx5715-setup.o
- obj-$(CONFIG_MACH_NSLU2)      += nslu2-pci.o nslu2-setup.o nslu2-power.o
- obj-$(CONFIG_MACH_NAS100D)    += nas100d-pci.o nas100d-setup.o nas100d-power.o
+       help
+diff -Nur linux-2.6.19/arch/arm/mach-ixp4xx/Makefile linux-2.6.19-owrt/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.19/arch/arm/mach-ixp4xx/Makefile 2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19-owrt/arch/arm/mach-ixp4xx/Makefile    2006-12-19 13:17:38.000000000 +0100
+@@ -20,5 +20,6 @@
+ obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
+ obj-$(CONFIG_MACH_NSLU2)      += nslu2-setup.o nslu2-power.o
+ obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o nas100d-power.o
 +obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-pci.o coyote-setup.o
  
-diff -Nur linux-2.6.17/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.17-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
---- linux-2.6.17/include/asm-arm/arch-ixp4xx/uncompress.h      2006-09-11 12:29:51.000000000 +0200
-+++ linux-2.6.17-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2006-09-11 12:31:21.000000000 +0200
+ obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
+diff -Nur linux-2.6.19/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
+--- linux-2.6.19/include/asm-arm/arch-ixp4xx/uncompress.h      2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2006-12-19 13:17:38.000000000 +0100
 @@ -38,9 +38,9 @@
  static __inline__ void __arch_decomp_setup(unsigned long arch_id)
  {
@@ -126,97 +222,3 @@ diff -Nur linux-2.6.17/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.17-owr
                uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
        else
                uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
-diff -Nur linux-2.6.17/arch/arm/mach-ixp4xx/coyote-setup.c linux-2.6.17-owrt/arch/arm/mach-ixp4xx/coyote-setup.c
---- linux-2.6.17/arch/arm/mach-ixp4xx/coyote-setup.c   2006-09-11 12:29:51.000000000 +0200
-+++ linux-2.6.17-owrt/arch/arm/mach-ixp4xx/coyote-setup.c      2006-09-11 12:37:51.000000000 +0200
-@@ -1,9 +1,10 @@
- /*
-  * arch/arm/mach-ixp4xx/coyote-setup.c
-  *
-- * Board setup for ADI Engineering and IXDGP425 boards
-+ * Board setup for ADI Engineering, IXDGP425 and Gateway 7001 boards
-  *
-  * Copyright (C) 2003-2005 MontaVista Software, Inc.
-+ * Copyright (C) 2006 Imre Kaloz <Kaloz@openwrt.org>
-  *
-  * Author: Deepak Saxena <dsaxena@plexity.net>
-  */
-@@ -73,9 +74,57 @@
-       .resource       = &coyote_uart_resource,
- };
- 
-+/* MACs */
-+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         = 0,
-+      .eth_id         = 0,
-+      .rxq_id         = 27,
-+      .txq_id         = 24,
-+};
-+
-+static struct mac_plat_info plat_mac1 = {
-+      .npe_id         = 2,
-+      .phy_id         = 1,
-+      .eth_id         = 1,
-+      .rxq_id         = 28,
-+      .txq_id         = 25,
-+};
-+
-+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,
-+};
-+
-+
- static struct platform_device *coyote_devices[] __initdata = {
-       &coyote_flash,
--      &coyote_uart
-+      &coyote_uart,
-+      &mac0,
-+      &mac1
- };
- 
- static void __init coyote_init(void)
-@@ -111,6 +160,19 @@
- MACHINE_END
- #endif
- 
-+#ifdef CONFIG_MACH_GATEWAY7001
-+MACHINE_START(GATEWAY7001, "Gateway 7001")
-+      /* Maintainer: Imre Kaloz <kaloz@openwrt.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   = coyote_init,
-+MACHINE_END
-+#endif
-+
- /*
-  * IXDPG425 is identical to Coyote except for which serial port
-  * is connected.
Personal OpenWRT clone
This page took 0.025999 seconds and 4 git commands to generate.