ARM: S3C24XX: Move common-smdk code to mach directory

This code is used by boards based on the S3C2410/S3C2440/S3C2416.
The patch includes also a rename of the option, as the smdk code
is not a mach itself, but only an extension with common code.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

3 files changed, 222 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 48af6fcb8acd..7dede0742daa 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -81,6 +81,15 @@ config CPU_S3C2443
         help
           Support for the S3C2443 SoC from the S3C24XX line
 
+# common code
+
+config S3C24XX_SMDK
+        bool
+        help
+          Common machine code for SMDK2410 and SMDK2440
+
+# cpu-specific sections
+
 if CPU_S3C2410
 
 config S3C2410_DMA
@@ -192,7 +201,7 @@ config MACH_QT2410
 
 config ARCH_SMDK2410
         bool "SMDK2410/A9M2410"
-        select MACH_SMDK
+        select S3C24XX_SMDK
         help
           Say Y here if you are using the SMDK2410 or the derived module A9M2410
           <http://www.fsforth.de>
@@ -279,7 +288,7 @@ config MACH_SMDK2412
 config MACH_SMDK2413
         bool "SMDK2413"
         select MACH_S3C2413
-        select MACH_SMDK
+        select S3C24XX_SMDK
         select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
         help
@@ -317,7 +326,7 @@ comment "S3C2416 Boards"
 
 config MACH_SMDK2416
         bool "SMDK2416"
-        select MACH_SMDK
+        select S3C24XX_SMDK
         select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
@@ -420,7 +429,7 @@ config MACH_RX3715
 config ARCH_S3C2440
         bool "SMDK2440"
         select S3C2440_XTAL_16934400
-        select MACH_SMDK
+        select S3C24XX_SMDK
         select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
         help
@@ -492,7 +501,7 @@ comment "S3C2443 Boards"
 
 config MACH_SMDK2443
         bool "SMDK2443"
-        select MACH_SMDK
+        select S3C24XX_SMDK
         select S3C_DEV_HSMMC1
         help
           Say Y here if you are using an SMDK2443
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile
index 876e5e54d976..b1c3c6f7c2eb 100644
--- a/arch/arm/mach-s3c24xx/Makefile
+++ b/arch/arm/mach-s3c24xx/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_MACH_SMDK2443)		+= mach-smdk2443.o
 
 # common bits of machine support
 
+obj-$(CONFIG_S3C24XX_SMDK)              += common-smdk.o
 obj-$(CONFIG_SIMTEC_NOR)                += nor-simtec.o
 
 # machine additions
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
new file mode 100644
index 000000000000..084604be6ad1
--- /dev/null
+++ b/arch/arm/mach-s3c24xx/common-smdk.c
@@ -0,0 +1,207 @@
+/* linux/arch/arm/plat-s3c24xx/common-smdk.c
+ *
+ * Copyright (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * Common code for SMDK2410 and SMDK2440 boards
+ *
+ * http://www.fluff.org/ben/smdk2440/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+#include <linux/io.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+#include <asm/irq.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
+
+#include <plat/nand.h>
+
+#include <plat/common-smdk.h>
+#include <plat/gpio-cfg.h>
+#include <plat/devs.h>
+#include <plat/pm.h>
+
+/* LED devices */
+
+static struct s3c24xx_led_platdata smdk_pdata_led4 = {
+        .gpio           = S3C2410_GPF(4),
+        .flags          = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
+        .name           = "led4",
+        .def_trigger    = "timer",
+};
+
+static struct s3c24xx_led_platdata smdk_pdata_led5 = {
+        .gpio           = S3C2410_GPF(5),
+        .flags          = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
+        .name           = "led5",
+        .def_trigger    = "nand-disk",
+};
+
+static struct s3c24xx_led_platdata smdk_pdata_led6 = {
+        .gpio           = S3C2410_GPF(6),
+        .flags          = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
+        .name           = "led6",
+};
+
+static struct s3c24xx_led_platdata smdk_pdata_led7 = {
+        .gpio           = S3C2410_GPF(7),
+        .flags          = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
+        .name           = "led7",
+};
+
+static struct platform_device smdk_led4 = {
+        .name           = "s3c24xx_led",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &smdk_pdata_led4,
+        },
+};
+
+static struct platform_device smdk_led5 = {
+        .name           = "s3c24xx_led",
+        .id             = 1,
+        .dev            = {
+                .platform_data = &smdk_pdata_led5,
+        },
+};
+
+static struct platform_device smdk_led6 = {
+        .name           = "s3c24xx_led",
+        .id             = 2,
+        .dev            = {
+                .platform_data = &smdk_pdata_led6,
+        },
+};
+
+static struct platform_device smdk_led7 = {
+        .name           = "s3c24xx_led",
+        .id             = 3,
+        .dev            = {
+                .platform_data = &smdk_pdata_led7,
+        },
+};
+
+/* NAND parititon from 2.4.18-swl5 */
+
+static struct mtd_partition smdk_default_nand_part[] = {
+        [0] = {
+                .name   = "Boot Agent",
+                .size   = SZ_16K,
+                .offset = 0,
+        },
+        [1] = {
+                .name   = "S3C2410 flash partition 1",
+                .offset = 0,
+                .size   = SZ_2M,
+        },
+        [2] = {
+                .name   = "S3C2410 flash partition 2",
+                .offset = SZ_4M,
+                .size   = SZ_4M,
+        },
+        [3] = {
+                .name   = "S3C2410 flash partition 3",
+                .offset = SZ_8M,
+                .size   = SZ_2M,
+        },
+        [4] = {
+                .name   = "S3C2410 flash partition 4",
+                .offset = SZ_1M * 10,
+                .size   = SZ_4M,
+        },
+        [5] = {
+                .name   = "S3C2410 flash partition 5",
+                .offset = SZ_1M * 14,
+                .size   = SZ_1M * 10,
+        },
+        [6] = {
+                .name   = "S3C2410 flash partition 6",
+                .offset = SZ_1M * 24,
+                .size   = SZ_1M * 24,
+        },
+        [7] = {
+                .name   = "S3C2410 flash partition 7",
+                .offset = SZ_1M * 48,
+                .size   = MTDPART_SIZ_FULL,
+        }
+};
+
+static struct s3c2410_nand_set smdk_nand_sets[] = {
+        [0] = {
+                .name           = "NAND",
+                .nr_chips       = 1,
+                .nr_partitions  = ARRAY_SIZE(smdk_default_nand_part),
+                .partitions     = smdk_default_nand_part,
+        },
+};
+
+/* choose a set of timings which should suit most 512Mbit
+ * chips and beyond.
+*/
+
+static struct s3c2410_platform_nand smdk_nand_info = {
+        .tacls          = 20,
+        .twrph0         = 60,
+        .twrph1         = 20,
+        .nr_sets        = ARRAY_SIZE(smdk_nand_sets),
+        .sets           = smdk_nand_sets,
+};
+
+/* devices we initialise */
+
+static struct platform_device __initdata *smdk_devs[] = {
+        &s3c_device_nand,
+        &smdk_led4,
+        &smdk_led5,
+        &smdk_led6,
+        &smdk_led7,
+};
+
+void __init smdk_machine_init(void)
+{
+        /* Configure the LEDs (even if we have no LED support)*/
+
+        s3c_gpio_cfgpin(S3C2410_GPF(4), S3C2410_GPIO_OUTPUT);
+        s3c_gpio_cfgpin(S3C2410_GPF(5), S3C2410_GPIO_OUTPUT);
+        s3c_gpio_cfgpin(S3C2410_GPF(6), S3C2410_GPIO_OUTPUT);
+        s3c_gpio_cfgpin(S3C2410_GPF(7), S3C2410_GPIO_OUTPUT);
+
+        s3c2410_gpio_setpin(S3C2410_GPF(4), 1);
+        s3c2410_gpio_setpin(S3C2410_GPF(5), 1);
+        s3c2410_gpio_setpin(S3C2410_GPF(6), 1);
+        s3c2410_gpio_setpin(S3C2410_GPF(7), 1);
+
+        if (machine_is_smdk2443())
+                smdk_nand_info.twrph0 = 50;
+
+        s3c_nand_set_platdata(&smdk_nand_info);
+
+        platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));
+
+        s3c_pm_init();
+}