ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

	arch/arm/mach-s3c2440/mach-anubis.c

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 9b04de2481d7..015dfb2a80da 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -150,7 +150,7 @@ static int external_map[]   = { 2 };
 static int chip0_map[]      = { 0 };
 static int chip1_map[]      = { 1 };
 
-static struct mtd_partition osiris_default_nand_part[] = {
+static struct mtd_partition __initdata osiris_default_nand_part[] = {
         [0] = {
                 .name   = "Boot Agent",
                 .size   = SZ_16K,
@@ -173,7 +173,7 @@ static struct mtd_partition osiris_default_nand_part[] = {
         }
 };
 
-static struct mtd_partition osiris_default_nand_part_large[] = {
+static struct mtd_partition __initdata osiris_default_nand_part_large[] = {
         [0] = {
                 .name   = "Boot Agent",
                 .size   = SZ_128K,
@@ -203,7 +203,7 @@ static struct mtd_partition osiris_default_nand_part_large[] = {
  * socket.
 */
 
-static struct s3c2410_nand_set osiris_nand_sets[] = {
+static struct s3c2410_nand_set __initdata osiris_nand_sets[] = {
         [1] = {
                 .name           = "External",
                 .nr_chips       = 1,
@@ -245,7 +245,7 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot)
         __raw_writeb(tmp, OSIRIS_VA_CTRL0);
 }
 
-static struct s3c2410_platform_nand osiris_nand_info = {
+static struct s3c2410_platform_nand __initdata osiris_nand_info = {
         .tacls          = 25,
         .twrph0         = 60,
         .twrph1         = 60,
@@ -411,8 +411,6 @@ static void __init osiris_map_io(void)
 
         s3c24xx_register_clocks(osiris_clocks, ARRAY_SIZE(osiris_clocks));
 
-        s3c_device_nand.dev.platform_data = &osiris_nand_info;
-
         s3c24xx_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc));
         s3c24xx_init_clocks(0);
         s3c24xx_init_uarts(osiris_uartcfgs, ARRAY_SIZE(osiris_uartcfgs));
@@ -442,6 +440,7 @@ static void __init osiris_init(void)
         sysdev_register(&osiris_pm_sysdev);
 
         s3c_i2c0_set_platdata(NULL);
+        s3c_nand_set_platdata(&osiris_nand_info);
 
         s3c_cpufreq_setboard(&osiris_cpufreq);