[ar71xx] update flash locking code

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ap83.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
index d5a30320614d694562c6b21174a485d9c0141aee..8564b01a62796abc11df97e0e6d61220dd4f221d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@@ -48,27 +48,27 @@ static struct mtd_partition ap83_flash_partitions[] = {
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
-               .name           = "rootfs",
+               .name           = "kernel",
                .offset         = 0x060000,
-               .size           = 0x400000,
+               .size           = 0x140000,
        } , {
-               .name           = "kernel",
-               .offset         = 0x460000,
-               .size           = 0x100000,
+               .name           = "rootfs",
+               .offset         = 0x1a0000,
+               .size           = 0x650000,
        } , {
                .name           = "art",
-               .offset         = 0x560000,
-               .size           = 0x2a0000,
+               .offset         = 0x7f0000,
+               .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
                .name           = "firmware",
                .offset         = 0x060000,
-               .size           = 0x500000,
+               .size           = 0x790000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
-static struct physmap_flash_data ap83_flash_data = {
+static struct ar91xx_flash_platform_data ap83_flash_data = {
        .width          = 2,
 #ifdef CONFIG_MTD_PARTITIONS
         .parts          = ap83_flash_partitions,
@@ -85,7 +85,7 @@ static struct resource ap83_flash_resources[] = {
 };
 
 static struct platform_device ap83_flash_device = {
-       .name           = "physmap-flash",
+       .name           = "ar91xx-flash",
        .id             = -1,
        .resource       = ap83_flash_resources,
        .num_resources  = ARRAY_SIZE(ap83_flash_resources),
@@ -221,7 +221,7 @@ static void __init ap83_generic_setup(void)
 
 static void __init ap83_040_setup(void)
 {
-       ar71xx_flash_lock_enable();
+       ap83_flash_data.is_shared=1;
        ap83_generic_setup();
        platform_device_register(&ap83_040_spi_device);
 }