[ar7] handle new revisions of vlynq wrt reset sequence, patch from sn9

[openwrt.git] / target / linux / kirkwood / patches / 100-dockstar.patch

diff --git a/target/linux/kirkwood/patches/100-dockstar.patch b/target/linux/kirkwood/patches/100-dockstar.patch
index 921faaf..59334b4 100644 (file)
--- a/target/linux/kirkwood/patches/100-dockstar.patch
+++ b/target/linux/kirkwood/patches/100-dockstar.patch
@@ -11,13 +11,11 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx>
  4 files changed, 120 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/mach-kirkwood/dockstar-setup.c
 
-diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
-index 29b2163..74d832f 100644
 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -32,6 +32,12 @@ config MACH_TS219
+@@ -99,6 +99,12 @@ config MACH_NET5BIG_V2
          Say 'Y' here if you want your kernel to support the
-         QNAP TS-119 and TS-219 Turbo NAS devices.
+         LaCie 5Big Network v2 NAS.
  
 +config MACH_DOCKSTAR
 +      bool "Seagate FreeAgent DockStar"
@@ -26,24 +24,21 @@ index 29b2163..74d832f 100644
 +        Seagate FreeAgent DockStar.
 +
  endmenu
-  
+ 
  endif
-diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
-index c0cd5d3..025b256 100644
 --- a/arch/arm/mach-kirkwood/Makefile
 +++ b/arch/arm/mach-kirkwood/Makefile
-@@ -6,4 +6,5 @@ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)    += sheevaplug-setup.o
+@@ -5,6 +5,7 @@ obj-$(CONFIG_MACH_RD88F6192_NAS)       += rd88
+ obj-$(CONFIG_MACH_RD88F6281)          += rd88f6281-setup.o
+ obj-$(CONFIG_MACH_MV88F6281GTW_GE)    += mv88f6281gtw_ge-setup.o
  obj-$(CONFIG_MACH_SHEEVAPLUG)         += sheevaplug-setup.o
- obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
 +obj-$(CONFIG_MACH_DOCKSTAR)           += dockstar-setup.o
- 
- obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o
-diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
-new file mode 100644
-index 0000000..a90475d
+ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)   += sheevaplug-setup.o
+ obj-$(CONFIG_MACH_GURUPLUG)           += guruplug-setup.o
+ obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
 --- /dev/null
 +++ b/arch/arm/mach-kirkwood/dockstar-setup.c
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,121 @@
 +/*
 + * arch/arm/mach-kirkwood/dockstar-setup.c
 + *
@@ -66,7 +61,6 @@ index 0000000..a90475d
 +#include <asm/mach/arch.h>
 +#include <mach/kirkwood.h>
 +#include <plat/mvsdio.h>
-+#include <plat/orion_nand.h>
 +#include "common.h"
 +#include "mpp.h"
 +
@@ -86,7 +80,7 @@ index 0000000..a90475d
 +      }, {
 +              .name = "rootfs",
 +              .offset = MTDPART_OFS_NXTBLK,
-+              .size = SZ_64M,
++              .size = SZ_32M,
 +      }, {
 +              .name = "data",
 +              .offset = MTDPART_OFS_NXTBLK,
@@ -94,33 +88,6 @@ index 0000000..a90475d
 +      },
 +};
 +
-+static struct resource dockstar_nand_resource = {
-+      .flags          = IORESOURCE_MEM,
-+      .start          = KIRKWOOD_NAND_MEM_PHYS_BASE,
-+      .end            = KIRKWOOD_NAND_MEM_PHYS_BASE +
-+                        KIRKWOOD_NAND_MEM_SIZE - 1,
-+};
-+
-+static struct orion_nand_data dockstar_nand_data = {
-+      .parts          = dockstar_nand_parts,
-+      .nr_parts       = ARRAY_SIZE(dockstar_nand_parts),
-+      .cle            = 0,
-+      .ale            = 1,
-+      .width          = 8,
-+      .chip_delay     = 25,
-+};
-+
-+static struct platform_device dockstar_nand_flash = {
-+      .name           = "orion_nand",
-+      .id             = -1,
-+      .dev            = {
-+              .platform_data  = &dockstar_nand_data,
-+      },
-+      .resource       = &dockstar_nand_resource,
-+      .num_resources  = 1,
-+};
-+
-+
 +static struct mv643xx_eth_platform_data dockstar_ge00_data = {
 +      .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
 +};
@@ -177,9 +144,10 @@ index 0000000..a90475d
 +              printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n");
 +      kirkwood_ehci_init();
 +
++      kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25);
++
 +      kirkwood_ge00_init(&dockstar_ge00_data);
 +
-+      platform_device_register(&dockstar_nand_flash);
 +      platform_device_register(&dockstar_leds);
 +}
 +
@@ -192,15 +160,3 @@ index 0000000..a90475d
 +      .init_irq       = kirkwood_init_irq,
 +      .timer          = &kirkwood_timer,
 +MACHINE_END
-diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
-index 48cbdcb..8d56837 100644
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -2245,3 +2245,4 @@ davinci_dm365_dvr        MACH_DAVINCI_DM365_DVR  DAVINCI_DM365_DVR       2963
- omap3_wl_ff           MACH_OMAP3_WL_FF        OMAP3_WL_FF             2258
- simcom                        MACH_SIMCOM             SIMCOM                  2259
- mcwebio                       MACH_MCWEBIO            MCWEBIO                 2260
-+dockstar              MACH_DOCKSTAR           DOCKSTAR                2998
--- 
-1.7.1
-