diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-08-29 21:10:59 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-08-29 21:10:59 +0000 |
| commit | b4cfb2a3b6440857e8553a04f7bfa48db5fa2a73 (patch) | |
| tree | 86e88a55203138e4ee7676ce9494ed127fd6276a /target/linux/kirkwood/patches | |
| parent | 79943e8679d785b4a831579202d9fe1a2501733c (diff) | |
| download | upstream-b4cfb2a3b6440857e8553a04f7bfa48db5fa2a73.tar.gz upstream-b4cfb2a3b6440857e8553a04f7bfa48db5fa2a73.tar.bz2 upstream-b4cfb2a3b6440857e8553a04f7bfa48db5fa2a73.zip | |
[kirkwood] Use kirkwood_nand_init instead of manually registering the nand driver
This fixes that the device would hang during boot.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22837 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/patches')
| -rw-r--r-- | target/linux/kirkwood/patches/100-dockstar.patch | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/target/linux/kirkwood/patches/100-dockstar.patch b/target/linux/kirkwood/patches/100-dockstar.patch index f6ac90b7a8..59334b4cda 100644 --- a/target/linux/kirkwood/patches/100-dockstar.patch +++ b/target/linux/kirkwood/patches/100-dockstar.patch @@ -38,7 +38,7 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx> 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 + * @@ -61,7 +61,6 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx> +#include <asm/mach/arch.h> +#include <mach/kirkwood.h> +#include <plat/mvsdio.h> -+#include <plat/orion_nand.h> +#include "common.h" +#include "mpp.h" + @@ -81,7 +80,7 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx> + }, { + .name = "rootfs", + .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_64M, ++ .size = SZ_32M, + }, { + .name = "data", + .offset = MTDPART_OFS_NXTBLK, @@ -89,33 +88,6 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx> + }, +}; + -+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), +}; @@ -172,9 +144,10 @@ Signed-off-by: Eric Cooper <ecc@xxxxxxx> + 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); +} + |