[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

In the various AT91 board files, replace hard-coded size values (eg,
0x800000) with the SZ_ size definitions (eg, SZ_8M) from sizes.h
Also replace MTD partition offsets with MTDPART_OFS_NXTBLK.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index 196199552eb6dbe18d079840994decf522fa37a5..201b89392dcc4ec91555b9d139ee87757b8a1004 100644 (file)
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -214,7 +214,7 @@ static struct physmap_flash_data cap9adk_nor_data = {
 };
 
 #define NOR_BASE       AT91_CHIPSELECT_0
-#define NOR_SIZE       0x800000
+#define NOR_SIZE       SZ_8M
 
 static struct resource nor_flash_resources[] = {
        {

diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index cb7c9a8fa487e09c123203743ade3d9441afea8a..4bdf69d552eb0e24babfe567e85250e62c39afe5 100644 (file)
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -28,7 +28,6 @@
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -37,6 +36,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 
@@ -114,7 +114,7 @@ static struct spi_board_info csb337_spi_devices[] = {
 };
 
 #define CSB_FLASH_BASE AT91_CHIPSELECT_0
-#define CSB_FLASH_SIZE 0x800000
+#define CSB_FLASH_SIZE SZ_8M
 
 static struct mtd_partition csb_flash_partitions[] = {
        {

diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index 8db8bd8babd96fd31de8d46d7e8eb8e5b8dd6d68..cfa3f04b22053e7d8d69d7f80fddbaf24a812ae7 100644 (file)
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -25,7 +25,6 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -34,6 +33,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 
@@ -72,7 +72,7 @@ static struct at91_udc_data __initdata csb637_udc_data = {
 };
 
 #define CSB_FLASH_BASE AT91_CHIPSELECT_0
-#define CSB_FLASH_SIZE 0x1000000
+#define CSB_FLASH_SIZE SZ_16M
 
 static struct mtd_partition csb_flash_partitions[] = {
        {

diff --git a/arch/arm/mach-at91/board-dk.c b/arch/arm/mach-at91/board-dk.c
index 43e1aa7ecef78cb27c98a9c9d0b7c100f904abde..0fd0f5bc77ea56623e83a37440da77e33f683af2 100644 (file)
--- a/arch/arm/mach-at91/board-dk.c
+++ b/arch/arm/mach-at91/board-dk.c
@@ -29,7 +29,6 @@
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
@@ -157,7 +157,7 @@ static struct atmel_nand_data __initdata dk_nand_data = {
 };
 
 #define DK_FLASH_BASE  AT91_CHIPSELECT_0
-#define DK_FLASH_SIZE  0x200000
+#define DK_FLASH_SIZE  SZ_2M
 
 static struct physmap_flash_data dk_flash_data = {
        .width          = 2,

diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index bfeee8a2af285a4e307be42c94a922de0626d007..1d69908617f07cdb18e58322f9c59fe61069da44 100644 (file)
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -86,7 +86,7 @@ static struct mtd_partition __initdata my_flash0_partitions[] =
        {       /* 0x8400 */
                .name   = "Darrell-loader",
                .offset = 0,
-               .size   = 12* 1056,
+               .size   = 12 * 1056,
        },
        {
                .name   = "U-boot",

diff --git a/arch/arm/mach-at91/board-ek.c b/arch/arm/mach-at91/board-ek.c
index 60626e7a3490d4c3e1424a5e2da4a8781c473d45..4cdfaac8e590fe2397204d231c1091dde3571a85 100644 (file)
--- a/arch/arm/mach-at91/board-ek.c
+++ b/arch/arm/mach-at91/board-ek.c
@@ -29,7 +29,6 @@
 #include <linux/spi/spi.h>
 #include <linux/mtd/physmap.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
@@ -116,7 +116,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = {
 };
 
 #define EK_FLASH_BASE  AT91_CHIPSELECT_0
-#define EK_FLASH_SIZE  0x200000
+#define EK_FLASH_SIZE  SZ_2M
 
 static struct physmap_flash_data ek_flash_data = {
        .width          = 2,

diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index dbc912d633c76b4e52bba9374b55cb77a2e4a9c2..859727e7ea301adeb807246c98bb7d2df812f51b 100644 (file)
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -105,7 +105,7 @@ static struct at91_mmc_data __initdata picotux200_mmc_data = {
 // };
 
 #define PICOTUX200_FLASH_BASE  AT91_CHIPSELECT_0
-#define PICOTUX200_FLASH_SIZE  0x400000
+#define PICOTUX200_FLASH_SIZE  SZ_4M
 
 static struct physmap_flash_data picotux200_flash_data = {
        .width  = 2,

diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
index 4c28413426c216f738d59ad0485fecb94875e691..cfb4571a2e275d00c52a587a8ed21d71d9d7b59a 100644 (file)
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -30,7 +30,6 @@
 #include <linux/input.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -39,6 +38,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91_shdwc.h>
@@ -119,18 +119,18 @@ static struct at91_eth_data __initdata ek_macb_data = {
 static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Uboot & Kernel",
-               .offset = 0x00000000,
-               .size   = 16 * 1024 * 1024,
+               .offset = 0,
+               .size   = SZ_16M,
        },
        {
                .name   = "Root FS",
-               .offset = 0x01000000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        },
        {
                .name   = "FS",
-               .offset = 0x08800000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        },
 };
 

diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index e4910cb26c16876cb63e8d3acac1704ff6ba01f5..99bb4cc23a0950af07d18712b077696c2f6842c9 100644 (file)
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -126,11 +126,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Bootloader Area",
                .offset = 0,
-               .size   = 10 * 1024 * 1024,
+               .size   = 10 * SZ_1M,
        },
        {
                .name   = "User Area",
-               .offset = 10 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index 0a53c038b518dd410b80155eda287423cb3c2ca5..e22433d5dfb63cd407427983aaacf946eb36fcac 100644 (file)
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -29,7 +29,6 @@
 #include <linux/clk.h>
 #include <linux/i2c/at24.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 
@@ -164,11 +164,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Partition 1",
                .offset = 0,
-               .size   = 256 * 1024,
+               .size   = SZ_256K,
        },
        {
                .name   = "Partition 2",
-               .offset = 256 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 1a9963b811c790e061fe490b4521b86db7fedf72..03d3382cfef65ba9575cddb634d176ed4ba7d56c 100644 (file)
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -35,7 +35,6 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -44,6 +43,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
@@ -168,11 +168,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Partition 1",
                .offset = 0,
-               .size   = 256 * 1024,
+               .size   = SZ_256K,
        },
        {
                .name   = "Partition 2",
-               .offset = 256 * 1024 ,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index c51f2eb3874b0eb192575c4fe1391eb7c63dd30c..ad71f4a71451821996c09080553f7ba81a982488 100644 (file)
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -33,7 +33,6 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -42,6 +41,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
@@ -173,11 +173,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Partition 1",
                .offset = 0,
-               .size   = 64 * 1024 * 1024,
+               .size   = SZ_64M,
        },
        {
                .name   = "Partition 2",
-               .offset = 64 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };
@@ -227,7 +227,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = {
 #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
 static struct fb_videomode at91_tft_vga_modes[] = {
        {
-               .name           = "TX09D50VM1CCA @ 60",
+               .name           = "TX09D50VM1CCA @ 60",
                .refresh        = 60,
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
@@ -243,7 +243,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
 
 static struct fb_monspecs at91fb_default_monspecs = {
        .manufacturer   = "HIT",
-       .monitor        = "TX09D70VM1CCA",
+       .monitor        = "TX09D70VM1CCA",
 
        .modedb         = at91_tft_vga_modes,
        .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
@@ -254,7 +254,7 @@ static struct fb_monspecs at91fb_default_monspecs = {
 };
 
 #define AT91SAM9263_DEFAULT_LCDCON2    (ATMEL_LCDC_MEMOR_LITTLE \
-                                       | ATMEL_LCDC_DISTYPE_TFT    \
+                                       | ATMEL_LCDC_DISTYPE_TFT \
                                        | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
 
 static void at91_lcdc_power_control(int on)

diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index d4eba5c0ce0262ae2b5885d7022ddb3cc38e6e87..b588ead14d68a4cb569f1ca8384c166a32bffb33 100644 (file)
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -122,16 +122,16 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Bootstrap",
                .offset = 0,
-               .size   = 4 * 1024 * 1024,
+               .size   = 4 * SZ_1M,
        },
        {
                .name   = "Partition 1",
-               .offset = 4 * 1024 * 1024,
-               .size   = 60 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 60 * SZ_1M,
        },
        {
                .name   = "Partition 2",
-               .offset = 64 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index c6dce49c388c92b70a35b807dcfe9bbde907b567..3d3f61572cff560f7ae175cc454da59c5cdb414c 100644 (file)
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -18,7 +18,6 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -27,6 +26,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
@@ -81,11 +81,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Partition 1",
                .offset = 0,
-               .size   = 256 * 1024,
+               .size   = SZ_256K,
        },
        {
                .name   = "Partition 2",
-               .offset = 256 * 1024 ,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c
index f9d0b65da40b1bbfaf3472c0eb52070b7f9d7549..7c350357333a0b708cc143d1efcb3df01ee61f05 100644 (file)
--- a/arch/arm/mach-at91/board-usb-a9260.c
+++ b/arch/arm/mach-at91/board-usb-a9260.c
@@ -30,7 +30,6 @@
 #include <linux/input.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -39,6 +38,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91_shdwc.h>
@@ -93,18 +93,18 @@ static struct at91_eth_data __initdata ek_macb_data = {
 static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Uboot & Kernel",
-               .offset = 0x00000000,
-               .size   = 16 * 1024 * 1024,
+               .offset = 0,
+               .size   = SZ_16M,
        },
        {
                .name   = "Root FS",
-               .offset = 0x01000000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        },
        {
                .name   = "FS",
-               .offset = 0x08800000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        }
 };
 

diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c
index 673e5c27214d93f8833357bee27fc91265c6e425..391b566c4571153ad345b67c1e6b903ab008df0e 100644 (file)
--- a/arch/arm/mach-at91/board-usb-a9263.c
+++ b/arch/arm/mach-at91/board-usb-a9263.c
@@ -29,7 +29,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91_shdwc.h>
@@ -106,18 +106,18 @@ static struct at91_eth_data __initdata ek_macb_data = {
 static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Linux Kernel",
-               .offset = 0x00000000,
-               .size   = 16 * 1024 * 1024,
+               .offset = 0,
+               .size   = SZ_16M,
        },
        {
                .name   = "Root FS",
-               .offset = 0x01000000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        },
        {
                .name   = "FS",
-               .offset = 0x08800000,
-               .size   = 120 * 1024 * 1024,
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = 120 * SZ_1M,
        }
 };
 

diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 36b380aad006d9c5fd32a9a986c58b6b47abaf81..e22bf051f835a1485453c7e8dea1102160dc416a 100644 (file)
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -33,7 +33,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -42,6 +41,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
@@ -150,27 +150,27 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = {
        {
                .name   = "AT91 NAND partition 1, boot",
                .offset = 0,
-               .size   = 1 * SZ_256K
+               .size   = SZ_256K
        },
        {
                .name   = "AT91 NAND partition 2, kernel",
-               .offset = 1 * SZ_256K,
-               .size   = 2 * SZ_1M - 1 * SZ_256K
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = (2 * SZ_1M) - SZ_256K
        },
        {
                .name   = "AT91 NAND partition 3, filesystem",
-               .offset = 2 * SZ_1M,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = 14 * SZ_1M
        },
        {
                .name   = "AT91 NAND partition 4, storage",
-               .offset = 16 * SZ_1M,
-               .size   = 16 * SZ_1M
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = SZ_16M
        },
        {
                .name   = "AT91 NAND partition 5, ext-fs",
-               .offset = 32 * SZ_1M,
-               .size   = 32 * SZ_1M
+               .offset = MTDPART_OFS_NXTBLK,
+               .size   = SZ_32M
        }
 };
 
@@ -193,24 +193,24 @@ static struct atmel_nand_data __initdata yl9200_nand_data = {
  * NOR Flash
  */
 #define YL9200_FLASH_BASE      AT91_CHIPSELECT_0
-#define YL9200_FLASH_SIZE      0x1000000
+#define YL9200_FLASH_SIZE      SZ_16M
 
 static struct mtd_partition yl9200_flash_partitions[] = {
        {
                .name           = "Bootloader",
-               .size           = 0x00040000,
                .offset         = 0,
+               .size           = SZ_256K,
                .mask_flags     = MTD_WRITEABLE,        /* force read-only */
        },
        {
                .name           = "Kernel",
-               .size           = 0x001C0000,
-               .offset         = 0x00040000,
+               .offset         = MTDPART_OFS_NXTBLK,
+               .size           = (2 * SZ_1M) - SZ_256K
        },
        {
                .name           = "Filesystem",
-               .size           = MTDPART_SIZ_FULL,
-               .offset         = 0x00200000
+               .offset         = MTDPART_OFS_NXTBLK,
+               .size           = MTDPART_SIZ_FULL
        }
 };
 
@@ -390,10 +390,6 @@ static struct spi_board_info yl9200_spi_devices[] = {
 #if defined(CONFIG_FB_S1D135XX) || defined(CONFIG_FB_S1D13XXX_MODULE)
 #include <video/s1d13xxxfb.h>
 
-#define AT91_FB_REG_BASE       0x80000000L
-#define AT91_FB_REG_SIZE       0x200
-#define AT91_FB_VMEM_BASE      0x80200000L
-#define AT91_FB_VMEM_SIZE      0x200000L
 
 static void __init yl9200_init_video(void)
 {
@@ -516,29 +512,33 @@ static struct s1d13xxxfb_regval yl9200_s1dfb_initregs[] =
        {S1DREG_COM_DISP_MODE,          0x01},  /* Display Mode Register, LCD only*/
 };
 
-static u64 s1dfb_dmamask = DMA_BIT_MASK(32);
-
 static struct s1d13xxxfb_pdata yl9200_s1dfb_pdata = {
        .initregs               = yl9200_s1dfb_initregs,
        .initregssize           = ARRAY_SIZE(yl9200_s1dfb_initregs),
        .platform_init_video    = yl9200_init_video,
 };
 
+#define YL9200_FB_REG_BASE     AT91_CHIPSELECT_7
+#define YL9200_FB_VMEM_BASE    YL9200_FB_REG_BASE + SZ_2M
+#define YL9200_FB_VMEM_SIZE    SZ_2M
+
 static struct resource yl9200_s1dfb_resource[] = {
        [0] = { /* video mem */
                .name   = "s1d13xxxfb memory",
-               .start  = AT91_FB_VMEM_BASE,
-               .end    = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
+               .start  = YL9200_FB_VMEM_BASE,
+               .end    = YL9200_FB_VMEM_BASE + YL9200_FB_VMEM_SIZE -1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = { /* video registers */
                .name   = "s1d13xxxfb registers",
-               .start  = AT91_FB_REG_BASE,
-               .end    = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
+               .start  = YL9200_FB_REG_BASE,
+               .end    = YL9200_FB_REG_BASE + SZ_512 -1,
                .flags  = IORESOURCE_MEM,
        },
 };
 
+static u64 s1dfb_dmamask = DMA_BIT_MASK(32);
+
 static struct platform_device yl9200_s1dfb_device = {
        .name           = "s1d13806fb",
        .id             = -1,