enable AMD flash support and physmap on orion

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 190-cambria_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
index fd8eb30..5e682b0 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
-@@ -25,6 +25,14 @@ config MACH_AVILA
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -25,6 +25,14 @@

          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  
          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  


@@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA

-@@ -200,7 +208,7 @@ config CPU_IXP46X
+@@ -200,7 +208,7 @@

  
  config CPU_IXP43X
        bool
  
  config CPU_IXP43X
        bool


@@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
        default y
  
  config MACH_GTWX5715
        default y
  
  config MACH_GTWX5715

-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
-@@ -7,6 +7,7 @@ obj-pci-n      :=
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -7,6 +7,7 @@

  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o


@@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o

-@@ -28,6 +29,7 @@ obj-y        += common.o
+@@ -28,6 +29,7 @@

  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o


@@ -46,10 +42,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
  obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
  obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
  obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
  obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o

-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
++++ b/arch/arm/mach-ixp4xx/cambria-pci.c

 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/cambria-pci.c
 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/cambria-pci.c


@@ -125,10 +119,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
 +}
 +
 +subsys_initcall(cambria_pci_init);
 +}
 +
 +subsys_initcall(cambria_pci_init);

-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
++++ b/arch/arm/mach-ixp4xx/cambria-setup.c

 @@ -0,0 +1,444 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c
 @@ -0,0 +1,444 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c


@@ -266,13 +258,13 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
 +};
 +
 +static struct eth_plat_info cambria_npec_data = {
 +};
 +
 +static struct eth_plat_info cambria_npec_data = {

-+      .phy            = 2,
++      .phy            = 1,

 +      .rxq            = 4,
 +      .txreadyq       = 21,
 +};
 +
 +static struct eth_plat_info cambria_npea_data = {
 +      .rxq            = 4,
 +      .txreadyq       = 21,
 +};
 +
 +static struct eth_plat_info cambria_npea_data = {

-+      .phy            = 1,
++      .phy            = 2,

 +      .rxq            = 2,
 +      .txreadyq       = 19,
 +};
 +      .rxq            = 2,
 +      .txreadyq       = 19,
 +};


@@ -574,10 +566,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
 +      .init_machine   = cambria_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = cambria_init,
 +MACHINE_END
 +#endif

-Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h
-+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
+--- a/include/asm-arm/arch-ixp4xx/hardware.h
++++ b/include/asm-arm/arch-ixp4xx/hardware.h

 @@ -18,7 +18,7 @@
  #define __ASM_ARCH_HARDWARE_H__
  
 @@ -18,7 +18,7 @@
  #define __ASM_ARCH_HARDWARE_H__