enable AMD flash support and physmap on orion

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 031-ixp4xx-net-drivers-nslu2.patch
diff --git a/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch

index d4c710c..cd500a5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c
  ===================================================================
  ===================================================================
---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c      2008-01-08 15:28:13.000000000 +1030
-+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c   2008-01-08 15:28:32.000000000 +1030
+--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c
  @@ -24,6 +24,7 @@
   #include <asm/mach/arch.h>
   #include <asm/mach/flash.h>
  @@ -24,6 +24,7 @@
   #include <asm/mach/arch.h>
   #include <asm/mach/flash.h>
@@ -10,7 +10,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
   
   static struct flash_platform_data nslu2_flash_data = {
         .map_name               = "cfi_probe",
   
   static struct flash_platform_data nslu2_flash_data = {
         .map_name               = "cfi_probe",
-@@ -140,6 +141,23 @@
+@@ -140,6 +141,23 @@ static struct platform_device nslu2_uart
         .resource               = nslu2_uart_resources,
   };
   
         .resource               = nslu2_uart_resources,
   };
   
@@ -34,7 +34,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
   static struct platform_device *nslu2_devices[] __initdata = {
         &nslu2_i2c_gpio,
         &nslu2_flash,
   static struct platform_device *nslu2_devices[] __initdata = {
         &nslu2_i2c_gpio,
         &nslu2_flash,
-@@ -147,6 +165,7 @@
+@@ -147,6 +165,7 @@ static struct platform_device *nslu2_dev
   #ifdef CONFIG_LEDS_IXP4XX
         &nslu2_leds,
   #endif
   #ifdef CONFIG_LEDS_IXP4XX
         &nslu2_leds,
   #endif
@@ -42,7 +42,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
   };
   
   static void nslu2_power_off(void)
   };
   
   static void nslu2_power_off(void)
-@@ -175,6 +194,9 @@
+@@ -175,6 +194,9 @@ static struct sys_timer nslu2_timer = {
   
   static void __init nslu2_init(void)
   {
   
   static void __init nslu2_init(void)
   {
@@ -52,7 +52,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
         ixp4xx_sys_init();
   
         nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
         ixp4xx_sys_init();
   
         nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-@@ -191,6 +213,33 @@
+@@ -191,6 +213,33 @@ static void __init nslu2_init(void)
         (void)platform_device_register(&nslu2_uart);
   
         platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
         (void)platform_device_register(&nslu2_uart);
   
         platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));