ARM: SAMSUNG: Add platform support code for OneNAND controller

This patch adds setup code for Samsung OneNAND controller driver. The driver needs to be aware on which SoC it is running, so the actual device id is being changed in cpu init code. S3C64xx SoCs have 2 OneNAND controllers while S5PC100 and S5PC110 has only one. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [ben-linux@fluff.org: sort map.h entries] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
author: Marek Szyprowski <m.szyprowski@samsung.com> 2010-05-20 02:59:05 -0400
committer: Ben Dooks <ben-linux@fluff.org> 2010-05-20 04:48:36 -0400
commit: 999304be1177d42d16bc59c546228c6ac5a3e76a (patch)
tree: ab8ba2b618484e93033bcc53fe0a4e014434d99f
parent: 504d36e91ac12ccdb0e1193cee7bef9831a1c99e (diff)
19 files changed, 320 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 69e9fbfea91..805da81095f 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -35,6 +35,11 @@ config S3C64XX_SETUP_SDHCI
          Internal configuration for default SDHCI setup for S3C6400 and
          S3C6410 SoCs.
+config S3C64XX_DEV_ONENAND1
+        bool
+        help
+          Compile in platform device definition for OneNAND1 controller
 # platform specific device setup
 config S3C64XX_SETUP_I2C0
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index a10f1fc6b02..17883187c4c 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -59,3 +59,4 @@ obj-y				+= dev-uart.o
 obj-y                           += dev-audio.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
 obj-$(CONFIG_S3C64XX_DEV_TS)    += dev-ts.o
+obj-$(CONFIG_S3C64XX_DEV_ONENAND1)      += dev-onenand1.o
diff --git a/arch/arm/mach-s3c64xx/dev-onenand1.c b/arch/arm/mach-s3c64xx/dev-onenand1.c
new file mode 100644
index 00000000000..92ffd5bac10
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/dev-onenand1.c
@@ -0,0 +1,55 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/dev-onenand1.c
+ *
+ *  Copyright (c) 2008-2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * S3C64XX series device definition for OneNAND devices
+ *
+ * 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/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <mach/irqs.h>
+#include <mach/map.h>
+static struct resource s3c64xx_onenand1_resources[] = {
+        [0] = {
+                .start  = S3C64XX_PA_ONENAND1,
+                .end    = S3C64XX_PA_ONENAND1 + 0x400 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S3C64XX_PA_ONENAND1_BUF,
+                .end    = S3C64XX_PA_ONENAND1_BUF + S3C64XX_SZ_ONENAND1_BUF - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = IRQ_ONENAND1,
+                .end    = IRQ_ONENAND1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+struct platform_device s3c64xx_device_onenand1 = {
+        .name           = "samsung-onenand",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(s3c64xx_onenand1_resources),
+        .resource       = s3c64xx_onenand1_resources,
+};
+void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)
+{
+        struct onenand_platform_data *pd;
+        pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
+        if (!pd)
+                printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+        s3c64xx_device_onenand1.dev.platform_data = pd;
+}
diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h
index e9ab4ac0b9a..8e2df26cf14 100644
--- a/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -212,5 +212,9 @@
 #define NR_IRQS (IRQ_BOARD_END + 1)
+/* Compatibility */
+#define IRQ_ONENAND     IRQ_ONENAND0
 #endif /* __ASM_MACH_S3C64XX_IRQS_H */
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 9fdd50c8c76..b6fb8920b41 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -52,6 +52,16 @@
 #define S3C64XX_PA_SROM         (0x70000000)
+#define S3C64XX_PA_ONENAND0     (0x70100000)
+#define S3C64XX_PA_ONENAND0_BUF (0x20000000)
+#define S3C64XX_SZ_ONENAND0_BUF (SZ_64M)
+/* NAND and OneNAND1 controllers occupy the same register region
+   (depending on SoC POP version) */
+#define S3C64XX_PA_ONENAND1     (0x70200000)
+#define S3C64XX_PA_ONENAND1_BUF (0x28000000)
+#define S3C64XX_SZ_ONENAND1_BUF (SZ_64M)
 #define S3C64XX_PA_NAND         (0x70200000)
 #define S3C64XX_PA_FB           (0x77100000)
 #define S3C64XX_PA_USB_HSOTG    (0x7C000000)
@@ -99,6 +109,9 @@
 #define S3C_PA_IIC              S3C64XX_PA_IIC0
 #define S3C_PA_IIC1             S3C64XX_PA_IIC1
 #define S3C_PA_NAND             S3C64XX_PA_NAND
+#define S3C_PA_ONENAND          S3C64XX_PA_ONENAND0
+#define S3C_PA_ONENAND_BUF      S3C64XX_PA_ONENAND0_BUF
+#define S3C_SZ_ONENAND_BUF      S3C64XX_SZ_ONENAND0_BUF
 #define S3C_PA_FB               S3C64XX_PA_FB
 #define S3C_PA_USBHOST          S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG        S3C64XX_PA_USB_HSOTG
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 707e34e3afd..5e93fe3f3f4 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -37,6 +37,7 @@
 #include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
+#include <plat/onenand-core.h>
 #include <mach/s3c6400.h>
 void __init s3c6400_map_io(void)
@@ -51,6 +52,9 @@ void __init s3c6400_map_io(void)
        s3c_i2c0_setname("s3c2440-i2c");
        s3c_device_nand.name = "s3c6400-nand";
+        s3c_onenand_setname("s3c6400-onenand");
+        s3c64xx_onenand1_setname("s3c6400-onenand");
 }
 void __init s3c6400_init_clocks(int xtal)
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 3ab695c691e..014401c39f3 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -39,6 +39,7 @@
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
 #include <plat/adc.h>
+#include <plat/onenand-core.h>
 #include <mach/s3c6400.h>
 #include <mach/s3c6410.h>
@@ -55,6 +56,8 @@ void __init s3c6410_map_io(void)
        s3c_device_adc.name     = "s3c64xx-adc";
        s3c_device_nand.name = "s3c6400-nand";
+        s3c_onenand_setname("s3c6410-onenand");
+        s3c64xx_onenand1_setname("s3c6410-onenand");
 }
 void __init s3c6410_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index d79e7574a85..cb37ffee05b 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -41,6 +41,8 @@
 #include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
+#include <plat/onenand-core.h>
 #include <plat/s5pc100.h>
 /* Initial IO mappings */
@@ -82,6 +84,8 @@ void __init s5pc100_map_io(void)
        /* the i2c devices are directly compatible with s3c2440 */
        s3c_i2c0_setname("s3c2440-i2c");
        s3c_i2c1_setname("s3c2440-i2c");
+        s3c_onenand_setname("s5pc100-onenand");
 }
 void __init s5pc100_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 4681ebe8bef..aba3bb4e341 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -31,6 +31,9 @@
 *
 */
+#define S5PC100_PA_ONENAND_BUF  (0xB0000000)
+#define S5PC100_SZ_ONENAND_BUF  (SZ_256M - SZ_32M)
 /* Chip ID */
 #define S5PC100_PA_CHIPID       (0xE0000000)
 #define S5PC1XX_PA_CHIPID       S5PC100_PA_CHIPID
@@ -60,6 +63,8 @@
 #define S5PC1XX_PA_VIC(x)       (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET))
 #define S5PC1XX_VA_VIC(x)       (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))
+#define S5PC100_PA_ONENAND      (0xE7100000)
 /* DMA */
 #define S5PC100_PA_MDMA         (0xE8100000)
 #define S5PC100_PA_PDMA0        (0xE9000000)
@@ -146,5 +151,8 @@
 #define S3C_PA_HSMMC2           S5PC100_PA_HSMMC2
 #define S3C_PA_KEYPAD           S5PC100_PA_KEYPAD
 #define S3C_PA_TSADC            S5PC100_PA_TSADC
+#define S3C_PA_ONENAND          S5PC100_PA_ONENAND
+#define S3C_PA_ONENAND_BUF      S5PC100_PA_ONENAND_BUF
+#define S3C_SZ_ONENAND_BUF      S5PC100_SZ_ONENAND_BUF
 #endif /* __ASM_ARCH_C100_MAP_H */
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 7601c28e240..ef063e2890c 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -21,6 +21,11 @@ choice
        depends on ARCH_S5PV210
        default MACH_SMDKV210
+config S5PC110_DEV_ONENAND
+        bool
+        help
+          Compile in platform device definition for OneNAND1 controller
 config MACH_SMDKV210
        bool "SMDKV210"
        select CPU_S5PV210
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 99827813d29..610b9496c18 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o
 # device support
 obj-y                           += dev-audio.o
+obj-$(CONFIG_S5PC110_DEV_ONENAND) += dev-onenand.o
+\ No newline at end of file
diff --git a/arch/arm/mach-s5pv210/dev-onenand.c b/arch/arm/mach-s5pv210/dev-onenand.c
new file mode 100644
index 00000000000..34997b752f9
--- /dev/null
+++ b/arch/arm/mach-s5pv210/dev-onenand.c
@@ -0,0 +1,50 @@
+/*
+ * linux/arch/arm/mach-s5pv210/dev-onenand.c
+ *
+ *  Copyright (c) 2008-2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * S5PC110 series device definition for OneNAND devices
+ *
+ * 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/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <mach/irqs.h>
+#include <mach/map.h>
+static struct resource s5pc110_onenand_resources[] = {
+        [0] = {
+                .start  = S5PC110_PA_ONENAND,
+                .end    = S5PC110_PA_ONENAND + SZ_128K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S5PC110_PA_ONENAND_DMA,
+                .end    = S5PC110_PA_ONENAND_DMA + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+struct platform_device s5pc110_device_onenand = {
+        .name           = "s5pc110-onenand",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(s5pc110_onenand_resources),
+        .resource       = s5pc110_onenand_resources,
+};
+void s5pc110_onenand_set_platdata(struct onenand_platform_data *pdata)
+{
+        struct onenand_platform_data *pd;
+        pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
+        if (!pd)
+                printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+        s5pc110_device_onenand.dev.platform_data = pd;
+}
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 5adcb9f26e4..d2a505fa1ff 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -16,6 +16,9 @@
 #include <plat/map-base.h>
 #include <plat/map-s5p.h>
+#define S5PC110_PA_ONENAND      (0xB0000000)
+#define S5PC110_PA_ONENAND_DMA  (0xB0600000)
 #define S5PV210_PA_CHIPID       (0xE0000000)
 #define S5P_PA_CHIPID           S5PV210_PA_CHIPID
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 229919e9744..58cc26d5309 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -190,6 +190,11 @@ config S3C_DEV_NAND
        help
          Compile in platform device definition for NAND controller
+config S3C_DEV_ONENAND
+        bool
+        help
+          Compile in platform device definition for OneNAND controller
 config S3C_DEV_RTC
        bool
        help
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 48288499a3b..595d86b8b89 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-y				+= dev-uart.o
 obj-$(CONFIG_S3C_DEV_USB_HOST)  += dev-usb.o
 obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
 obj-$(CONFIG_S3C_DEV_NAND)      += dev-nand.o
+obj-$(CONFIG_S3C_DEV_ONENAND)   += dev-onenand.o
 obj-$(CONFIG_S3C_DEV_RTC)       += dev-rtc.o
 obj-$(CONFIG_SAMSUNG_DEV_ADC)   += dev-adc.o
diff --git a/arch/arm/plat-samsung/dev-onenand.c b/arch/arm/plat-samsung/dev-onenand.c
new file mode 100644
index 00000000000..45ec73287d8
--- /dev/null
+++ b/arch/arm/plat-samsung/dev-onenand.c
@@ -0,0 +1,55 @@
+/*
+ * linux/arch/arm/plat-samsung/dev-onenand.c
+ *
+ *  Copyright (c) 2008-2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * S3C64XX/S5PC100 series device definition for OneNAND devices
+ *
+ * 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/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <mach/irqs.h>
+#include <mach/map.h>
+static struct resource s3c_onenand_resources[] = {
+        [0] = {
+                .start  = S3C_PA_ONENAND,
+                .end    = S3C_PA_ONENAND + 0x400 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S3C_PA_ONENAND_BUF,
+                .end    = S3C_PA_ONENAND_BUF + S3C_SZ_ONENAND_BUF - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = IRQ_ONENAND,
+                .end    = IRQ_ONENAND,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+struct platform_device s3c_device_onenand = {
+        .name           = "samsung-onenand",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(s3c_onenand_resources),
+        .resource       = s3c_onenand_resources,
+};
+void s3c_onenand_set_platdata(struct onenand_platform_data *pdata)
+{
+        struct onenand_platform_data *pd;
+        pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
+        if (!pd)
+                printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+        s3c_device_onenand.dev.platform_data = pd;
+}
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index ef69e56b288..57ec56ade02 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -60,6 +60,9 @@ extern struct platform_device s3c_device_spi1;
 extern struct platform_device s3c_device_hwmon;
 extern struct platform_device s3c_device_nand;
+extern struct platform_device s3c_device_onenand;
+extern struct platform_device s3c64xx_device_onenand1;
+extern struct platform_device s5pc110_device_onenand;
 extern struct platform_device s3c_device_usbgadget;
 extern struct platform_device s3c_device_usb_hsotg;
diff --git a/arch/arm/plat-samsung/include/plat/onenand-core.h b/arch/arm/plat-samsung/include/plat/onenand-core.h
new file mode 100644
index 00000000000..7701cb7020c
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/onenand-core.h
@@ -0,0 +1,37 @@
+/*
+ * linux/arch/arm/plat-samsung/onenand-core.h
+ *
+ *  Copyright (c) 2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *  Marek Szyprowski <m.szyprowski@samsung.com>
+ *
+ * Samsung OneNAD Controller core functions
+ *
+ * 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.
+*/
+#ifndef __ASM_ARCH_ONENAND_CORE_H
+#define __ASM_ARCH_ONENAND_CORE_H __FILE__
+/* These functions are only for use with the core support code, such as
+ * the cpu specific initialisation code
+ */
+/* re-define device name depending on support. */
+static inline void s3c_onenand_setname(char *name)
+{
+#ifdef CONFIG_S3C_DEV_ONENAND
+        s3c_device_onenand.name = name;
+#endif
+}
+static inline void s3c64xx_onenand1_setname(char *name)
+{
+#ifdef CONFIG_S3C64XX_DEV_ONENAND1
+        s3c64xx_device_onenand1.name = name;
+#endif
+}
+#endif /* __ASM_ARCH_ONENAND_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/regs-onenand.h b/arch/arm/plat-samsung/include/plat/regs-onenand.h
new file mode 100644
index 00000000000..930ea8b88ed
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/regs-onenand.h
@@ -0,0 +1,63 @@
+/*
+ * linux/arch/arm/plat-s3c/include/plat/regs-onenand.h
+ *
+ *  Copyright (C) 2008-2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * 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.
+ */
+#ifndef __SAMSUNG_ONENAND_H__
+#define __SAMSUNG_ONENAND_H__
+#include <mach/hardware.h>
+/*
+ * OneNAND Controller
+ */
+#define MEM_CFG_OFFSET          0x0000
+#define BURST_LEN_OFFSET        0x0010
+#define MEM_RESET_OFFSET        0x0020
+#define INT_ERR_STAT_OFFSET     0x0030
+#define INT_ERR_MASK_OFFSET     0x0040
+#define INT_ERR_ACK_OFFSET      0x0050
+#define ECC_ERR_STAT_OFFSET     0x0060
+#define MANUFACT_ID_OFFSET      0x0070
+#define DEVICE_ID_OFFSET        0x0080
+#define DATA_BUF_SIZE_OFFSET    0x0090
+#define BOOT_BUF_SIZE_OFFSET    0x00A0
+#define BUF_AMOUNT_OFFSET       0x00B0
+#define TECH_OFFSET             0x00C0
+#define FBA_WIDTH_OFFSET        0x00D0
+#define FPA_WIDTH_OFFSET        0x00E0
+#define FSA_WIDTH_OFFSET        0x00F0
+#define TRANS_SPARE_OFFSET      0x0140
+#define DBS_DFS_WIDTH_OFFSET    0x0160
+#define INT_PIN_ENABLE_OFFSET   0x01A0
+#define ACC_CLOCK_OFFSET        0x01C0
+#define FLASH_VER_ID_OFFSET     0x01F0
+#define FLASH_AUX_CNTRL_OFFSET  0x0300          /* s3c64xx only */
+#define ONENAND_MEM_RESET_HOT   0x3
+#define ONENAND_MEM_RESET_COLD  0x2
+#define ONENAND_MEM_RESET_WARM  0x1
+#define CACHE_OP_ERR            (1 << 13)
+#define RST_CMP                 (1 << 12)
+#define RDY_ACT                 (1 << 11)
+#define INT_ACT                 (1 << 10)
+#define UNSUP_CMD               (1 << 9)
+#define LOCKED_BLK              (1 << 8)
+#define BLK_RW_CMP              (1 << 7)
+#define ERS_CMP                 (1 << 6)
+#define PGM_CMP                 (1 << 5)
+#define LOAD_CMP                (1 << 4)
+#define ERS_FAIL                (1 << 3)
+#define PGM_FAIL                (1 << 2)
+#define INT_TO                  (1 << 1)
+#define LD_FAIL_ECC_ERR         (1 << 0)
+#define TSRF                    (1 << 0)
+#endif
author	Marek Szyprowski <m.szyprowski@samsung.com>	2010-05-20 02:59:05 -0400
committer	Ben Dooks <ben-linux@fluff.org>	2010-05-20 04:48:36 -0400
commit	999304be1177d42d16bc59c546228c6ac5a3e76a (patch)
tree	ab8ba2b618484e93033bcc53fe0a4e014434d99f
parent	504d36e91ac12ccdb0e1193cee7bef9831a1c99e (diff)

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 69e9fbfea91..805da81095f 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -35,6 +35,11 @@ config S3C64XX_SETUP_SDHCI
35	Internal configuration for default SDHCI setup for S3C6400 and	35	Internal configuration for default SDHCI setup for S3C6400 and
36	S3C6410 SoCs.	36	S3C6410 SoCs.
37		37
		38	config S3C64XX_DEV_ONENAND1
		39	bool
		40	help
		41	Compile in platform device definition for OneNAND1 controller
		42
38	# platform specific device setup	43	# platform specific device setup
39		44
40	config S3C64XX_SETUP_I2C0	45	config S3C64XX_SETUP_I2C0


diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index a10f1fc6b02..17883187c4c 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile
@@ -59,3 +59,4 @@ obj-y += dev-uart.o
59	obj-y += dev-audio.o	59	obj-y += dev-audio.o
60	obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o	60	obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
61	obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o	61	obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o
		62	obj-$(CONFIG_S3C64XX_DEV_ONENAND1) += dev-onenand1.o


diff --git a/arch/arm/mach-s3c64xx/dev-onenand1.c b/arch/arm/mach-s3c64xx/dev-onenand1.c new file mode 100644 index 00000000000..92ffd5bac10 --- /dev/null +++ b/arch/arm/mach-s3c64xx/dev-onenand1.c
@@ -0,0 +1,55 @@
		1	/*
		2	* linux/arch/arm/mach-s3c64xx/dev-onenand1.c
		3	*
		4	* Copyright (c) 2008-2010 Samsung Electronics
		5	* Kyungmin Park <kyungmin.park@samsung.com>
		6	*
		7	* S3C64XX series device definition for OneNAND devices
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of the GNU General Public License version 2 as
		11	* published by the Free Software Foundation.
		12	*/
		13
		14	#include <linux/kernel.h>
		15	#include <linux/platform_device.h>
		16	#include <linux/mtd/mtd.h>
		17	#include <linux/mtd/onenand.h>
		18
		19	#include <mach/irqs.h>
		20	#include <mach/map.h>
		21
		22	static struct resource s3c64xx_onenand1_resources[] = {
		23	[0] = {
		24	.start = S3C64XX_PA_ONENAND1,
		25	.end = S3C64XX_PA_ONENAND1 + 0x400 - 1,
		26	.flags = IORESOURCE_MEM,
		27	},
		28	[1] = {
		29	.start = S3C64XX_PA_ONENAND1_BUF,
		30	.end = S3C64XX_PA_ONENAND1_BUF + S3C64XX_SZ_ONENAND1_BUF - 1,
		31	.flags = IORESOURCE_MEM,
		32	},
		33	[2] = {
		34	.start = IRQ_ONENAND1,
		35	.end = IRQ_ONENAND1,
		36	.flags = IORESOURCE_IRQ,
		37	},
		38	};
		39
		40	struct platform_device s3c64xx_device_onenand1 = {
		41	.name = "samsung-onenand",
		42	.id = 1,
		43	.num_resources = ARRAY_SIZE(s3c64xx_onenand1_resources),
		44	.resource = s3c64xx_onenand1_resources,
		45	};
		46
		47	void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)
		48	{
		49	struct onenand_platform_data *pd;
		50
		51	pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
		52	if (!pd)
		53	printk(KERN_ERR "%s: no memory for platform data\n", __func__);
		54	s3c64xx_device_onenand1.dev.platform_data = pd;
		55	}


diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h index e9ab4ac0b9a..8e2df26cf14 100644 --- a/arch/arm/mach-s3c64xx/include/mach/irqs.h +++ b/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -212,5 +212,9 @@
212		212
213	#define NR_IRQS (IRQ_BOARD_END + 1)	213	#define NR_IRQS (IRQ_BOARD_END + 1)
214		214
		215	/* Compatibility */
		216
		217	#define IRQ_ONENAND IRQ_ONENAND0
		218
215	#endif /* __ASM_MACH_S3C64XX_IRQS_H */	219	#endif /* __ASM_MACH_S3C64XX_IRQS_H */
216		220


diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index 9fdd50c8c76..b6fb8920b41 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -52,6 +52,16 @@
52		52
53	#define S3C64XX_PA_SROM (0x70000000)	53	#define S3C64XX_PA_SROM (0x70000000)
54		54
		55	#define S3C64XX_PA_ONENAND0 (0x70100000)
		56	#define S3C64XX_PA_ONENAND0_BUF (0x20000000)
		57	#define S3C64XX_SZ_ONENAND0_BUF (SZ_64M)
		58
		59	/* NAND and OneNAND1 controllers occupy the same register region
		60	(depending on SoC POP version) */
		61	#define S3C64XX_PA_ONENAND1 (0x70200000)
		62	#define S3C64XX_PA_ONENAND1_BUF (0x28000000)
		63	#define S3C64XX_SZ_ONENAND1_BUF (SZ_64M)
		64
55	#define S3C64XX_PA_NAND (0x70200000)	65	#define S3C64XX_PA_NAND (0x70200000)
56	#define S3C64XX_PA_FB (0x77100000)	66	#define S3C64XX_PA_FB (0x77100000)
57	#define S3C64XX_PA_USB_HSOTG (0x7C000000)	67	#define S3C64XX_PA_USB_HSOTG (0x7C000000)
@@ -99,6 +109,9 @@
99	#define S3C_PA_IIC S3C64XX_PA_IIC0	109	#define S3C_PA_IIC S3C64XX_PA_IIC0
100	#define S3C_PA_IIC1 S3C64XX_PA_IIC1	110	#define S3C_PA_IIC1 S3C64XX_PA_IIC1
101	#define S3C_PA_NAND S3C64XX_PA_NAND	111	#define S3C_PA_NAND S3C64XX_PA_NAND
		112	#define S3C_PA_ONENAND S3C64XX_PA_ONENAND0
		113	#define S3C_PA_ONENAND_BUF S3C64XX_PA_ONENAND0_BUF
		114	#define S3C_SZ_ONENAND_BUF S3C64XX_SZ_ONENAND0_BUF
102	#define S3C_PA_FB S3C64XX_PA_FB	115	#define S3C_PA_FB S3C64XX_PA_FB
103	#define S3C_PA_USBHOST S3C64XX_PA_USBHOST	116	#define S3C_PA_USBHOST S3C64XX_PA_USBHOST
104	#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG	117	#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG


diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c index 707e34e3afd..5e93fe3f3f4 100644 --- a/arch/arm/mach-s3c64xx/s3c6400.c +++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -37,6 +37,7 @@
37	#include <plat/clock.h>	37	#include <plat/clock.h>
38	#include <plat/sdhci.h>	38	#include <plat/sdhci.h>
39	#include <plat/iic-core.h>	39	#include <plat/iic-core.h>
		40	#include <plat/onenand-core.h>
40	#include <mach/s3c6400.h>	41	#include <mach/s3c6400.h>
41		42
42	void __init s3c6400_map_io(void)	43	void __init s3c6400_map_io(void)
@@ -51,6 +52,9 @@ void __init s3c6400_map_io(void)
51	s3c_i2c0_setname("s3c2440-i2c");	52	s3c_i2c0_setname("s3c2440-i2c");
52		53
53	s3c_device_nand.name = "s3c6400-nand";	54	s3c_device_nand.name = "s3c6400-nand";
		55
		56	s3c_onenand_setname("s3c6400-onenand");
		57	s3c64xx_onenand1_setname("s3c6400-onenand");
54	}	58	}
55		59
56	void __init s3c6400_init_clocks(int xtal)	60	void __init s3c6400_init_clocks(int xtal)


diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index 3ab695c691e..014401c39f3 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -39,6 +39,7 @@
39	#include <plat/sdhci.h>	39	#include <plat/sdhci.h>
40	#include <plat/iic-core.h>	40	#include <plat/iic-core.h>
41	#include <plat/adc.h>	41	#include <plat/adc.h>
		42	#include <plat/onenand-core.h>
42	#include <mach/s3c6400.h>	43	#include <mach/s3c6400.h>
43	#include <mach/s3c6410.h>	44	#include <mach/s3c6410.h>
44		45
@@ -55,6 +56,8 @@ void __init s3c6410_map_io(void)
55		56
56	s3c_device_adc.name = "s3c64xx-adc";	57	s3c_device_adc.name = "s3c64xx-adc";
57	s3c_device_nand.name = "s3c6400-nand";	58	s3c_device_nand.name = "s3c6400-nand";
		59	s3c_onenand_setname("s3c6410-onenand");
		60	s3c64xx_onenand1_setname("s3c6410-onenand");
58	}	61	}
59		62
60	void __init s3c6410_init_clocks(int xtal)	63	void __init s3c6410_init_clocks(int xtal)


diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index d79e7574a85..cb37ffee05b 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c
@@ -41,6 +41,8 @@
41	#include <plat/clock.h>	41	#include <plat/clock.h>
42	#include <plat/sdhci.h>	42	#include <plat/sdhci.h>
43	#include <plat/iic-core.h>	43	#include <plat/iic-core.h>
		44	#include <plat/onenand-core.h>
		45
44	#include <plat/s5pc100.h>	46	#include <plat/s5pc100.h>
45		47
46	/* Initial IO mappings */	48	/* Initial IO mappings */
@@ -82,6 +84,8 @@ void __init s5pc100_map_io(void)
82	/* the i2c devices are directly compatible with s3c2440 */	84	/* the i2c devices are directly compatible with s3c2440 */
83	s3c_i2c0_setname("s3c2440-i2c");	85	s3c_i2c0_setname("s3c2440-i2c");
84	s3c_i2c1_setname("s3c2440-i2c");	86	s3c_i2c1_setname("s3c2440-i2c");
		87
		88	s3c_onenand_setname("s5pc100-onenand");
85	}	89	}
86		90
87	void __init s5pc100_init_clocks(int xtal)	91	void __init s5pc100_init_clocks(int xtal)


diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 4681ebe8bef..aba3bb4e341 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -31,6 +31,9 @@
31	*	31	*
32	*/	32	*/
33		33
		34	#define S5PC100_PA_ONENAND_BUF (0xB0000000)
		35	#define S5PC100_SZ_ONENAND_BUF (SZ_256M - SZ_32M)
		36
34	/* Chip ID */	37	/* Chip ID */
35	#define S5PC100_PA_CHIPID (0xE0000000)	38	#define S5PC100_PA_CHIPID (0xE0000000)
36	#define S5PC1XX_PA_CHIPID S5PC100_PA_CHIPID	39	#define S5PC1XX_PA_CHIPID S5PC100_PA_CHIPID
@@ -60,6 +63,8 @@
60	#define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET))	63	#define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET))
61	#define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))	64	#define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))
62		65
		66	#define S5PC100_PA_ONENAND (0xE7100000)
		67
63	/* DMA */	68	/* DMA */
64	#define S5PC100_PA_MDMA (0xE8100000)	69	#define S5PC100_PA_MDMA (0xE8100000)
65	#define S5PC100_PA_PDMA0 (0xE9000000)	70	#define S5PC100_PA_PDMA0 (0xE9000000)
@@ -146,5 +151,8 @@
146	#define S3C_PA_HSMMC2 S5PC100_PA_HSMMC2	151	#define S3C_PA_HSMMC2 S5PC100_PA_HSMMC2
147	#define S3C_PA_KEYPAD S5PC100_PA_KEYPAD	152	#define S3C_PA_KEYPAD S5PC100_PA_KEYPAD
148	#define S3C_PA_TSADC S5PC100_PA_TSADC	153	#define S3C_PA_TSADC S5PC100_PA_TSADC
		154	#define S3C_PA_ONENAND S5PC100_PA_ONENAND
		155	#define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF
		156	#define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF
149		157
150	#endif /* __ASM_ARCH_C100_MAP_H */	158	#endif /* __ASM_ARCH_C100_MAP_H */


diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 7601c28e240..ef063e2890c 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig
@@ -21,6 +21,11 @@ choice
21	depends on ARCH_S5PV210	21	depends on ARCH_S5PV210
22	default MACH_SMDKV210	22	default MACH_SMDKV210
23		23
		24	config S5PC110_DEV_ONENAND
		25	bool
		26	help
		27	Compile in platform device definition for OneNAND1 controller
		28
24	config MACH_SMDKV210	29	config MACH_SMDKV210
25	bool "SMDKV210"	30	bool "SMDKV210"
26	select CPU_S5PV210	31	select CPU_S5PV210


diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 99827813d29..610b9496c18 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_MACH_SMDKC110) += mach-smdkc110.o
23	# device support	23	# device support
24		24
25	obj-y += dev-audio.o	25	obj-y += dev-audio.o
		26	obj-$(CONFIG_S5PC110_DEV_ONENAND) += dev-onenand.o \ No newline at end of file


diff --git a/arch/arm/mach-s5pv210/dev-onenand.c b/arch/arm/mach-s5pv210/dev-onenand.c new file mode 100644 index 00000000000..34997b752f9 --- /dev/null +++ b/arch/arm/mach-s5pv210/dev-onenand.c
@@ -0,0 +1,50 @@
		1	/*
		2	* linux/arch/arm/mach-s5pv210/dev-onenand.c
		3	*
		4	* Copyright (c) 2008-2010 Samsung Electronics
		5	* Kyungmin Park <kyungmin.park@samsung.com>
		6	*
		7	* S5PC110 series device definition for OneNAND devices
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of the GNU General Public License version 2 as
		11	* published by the Free Software Foundation.
		12	*/
		13
		14	#include <linux/kernel.h>
		15	#include <linux/platform_device.h>
		16	#include <linux/mtd/mtd.h>
		17	#include <linux/mtd/onenand.h>
		18
		19	#include <mach/irqs.h>
		20	#include <mach/map.h>
		21
		22	static struct resource s5pc110_onenand_resources[] = {
		23	[0] = {
		24	.start = S5PC110_PA_ONENAND,
		25	.end = S5PC110_PA_ONENAND + SZ_128K - 1,
		26	.flags = IORESOURCE_MEM,
		27	},
		28	[1] = {
		29	.start = S5PC110_PA_ONENAND_DMA,
		30	.end = S5PC110_PA_ONENAND_DMA + SZ_2K - 1,
		31	.flags = IORESOURCE_MEM,
		32	},
		33	};
		34
		35	struct platform_device s5pc110_device_onenand = {
		36	.name = "s5pc110-onenand",
		37	.id = -1,
		38	.num_resources = ARRAY_SIZE(s5pc110_onenand_resources),
		39	.resource = s5pc110_onenand_resources,
		40	};
		41
		42	void s5pc110_onenand_set_platdata(struct onenand_platform_data *pdata)
		43	{
		44	struct onenand_platform_data *pd;
		45
		46	pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
		47	if (!pd)
		48	printk(KERN_ERR "%s: no memory for platform data\n", __func__);
		49	s5pc110_device_onenand.dev.platform_data = pd;
		50	}


diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 5adcb9f26e4..d2a505fa1ff 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -16,6 +16,9 @@
16	#include <plat/map-base.h>	16	#include <plat/map-base.h>
17	#include <plat/map-s5p.h>	17	#include <plat/map-s5p.h>
18		18
		19	#define S5PC110_PA_ONENAND (0xB0000000)
		20	#define S5PC110_PA_ONENAND_DMA (0xB0600000)
		21
19	#define S5PV210_PA_CHIPID (0xE0000000)	22	#define S5PV210_PA_CHIPID (0xE0000000)
20	#define S5P_PA_CHIPID S5PV210_PA_CHIPID	23	#define S5P_PA_CHIPID S5PV210_PA_CHIPID
21		24


diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 229919e9744..58cc26d5309 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig
@@ -190,6 +190,11 @@ config S3C_DEV_NAND
190	help	190	help
191	Compile in platform device definition for NAND controller	191	Compile in platform device definition for NAND controller
192		192
		193	config S3C_DEV_ONENAND
		194	bool
		195	help
		196	Compile in platform device definition for OneNAND controller
		197
193	config S3C_DEV_RTC	198	config S3C_DEV_RTC
194	bool	199	bool
195	help	200	help


diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 48288499a3b..595d86b8b89 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-y += dev-uart.o
41	obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o	41	obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
42	obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o	42	obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
43	obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o	43	obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
		44	obj-$(CONFIG_S3C_DEV_ONENAND) += dev-onenand.o
44	obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o	45	obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o
45		46
46	obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o	47	obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o


diff --git a/arch/arm/plat-samsung/dev-onenand.c b/arch/arm/plat-samsung/dev-onenand.c new file mode 100644 index 00000000000..45ec73287d8 --- /dev/null +++ b/arch/arm/plat-samsung/dev-onenand.c
@@ -0,0 +1,55 @@
		1	/*
		2	* linux/arch/arm/plat-samsung/dev-onenand.c
		3	*
		4	* Copyright (c) 2008-2010 Samsung Electronics
		5	* Kyungmin Park <kyungmin.park@samsung.com>
		6	*
		7	* S3C64XX/S5PC100 series device definition for OneNAND devices
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of the GNU General Public License version 2 as
		11	* published by the Free Software Foundation.
		12	*/
		13
		14	#include <linux/kernel.h>
		15	#include <linux/platform_device.h>
		16	#include <linux/mtd/mtd.h>
		17	#include <linux/mtd/onenand.h>
		18
		19	#include <mach/irqs.h>
		20	#include <mach/map.h>
		21
		22	static struct resource s3c_onenand_resources[] = {
		23	[0] = {
		24	.start = S3C_PA_ONENAND,
		25	.end = S3C_PA_ONENAND + 0x400 - 1,
		26	.flags = IORESOURCE_MEM,
		27	},
		28	[1] = {
		29	.start = S3C_PA_ONENAND_BUF,
		30	.end = S3C_PA_ONENAND_BUF + S3C_SZ_ONENAND_BUF - 1,
		31	.flags = IORESOURCE_MEM,
		32	},
		33	[2] = {
		34	.start = IRQ_ONENAND,
		35	.end = IRQ_ONENAND,
		36	.flags = IORESOURCE_IRQ,
		37	},
		38	};
		39
		40	struct platform_device s3c_device_onenand = {
		41	.name = "samsung-onenand",
		42	.id = 0,
		43	.num_resources = ARRAY_SIZE(s3c_onenand_resources),
		44	.resource = s3c_onenand_resources,
		45	};
		46
		47	void s3c_onenand_set_platdata(struct onenand_platform_data *pdata)
		48	{
		49	struct onenand_platform_data *pd;
		50
		51	pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
		52	if (!pd)
		53	printk(KERN_ERR "%s: no memory for platform data\n", __func__);
		54	s3c_device_onenand.dev.platform_data = pd;
		55	}


diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index ef69e56b288..57ec56ade02 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -60,6 +60,9 @@ extern struct platform_device s3c_device_spi1;
60	extern struct platform_device s3c_device_hwmon;	60	extern struct platform_device s3c_device_hwmon;
61		61
62	extern struct platform_device s3c_device_nand;	62	extern struct platform_device s3c_device_nand;
		63	extern struct platform_device s3c_device_onenand;
		64	extern struct platform_device s3c64xx_device_onenand1;
		65	extern struct platform_device s5pc110_device_onenand;
63		66
64	extern struct platform_device s3c_device_usbgadget;	67	extern struct platform_device s3c_device_usbgadget;
65	extern struct platform_device s3c_device_usb_hsotg;	68	extern struct platform_device s3c_device_usb_hsotg;


diff --git a/arch/arm/plat-samsung/include/plat/onenand-core.h b/arch/arm/plat-samsung/include/plat/onenand-core.h new file mode 100644 index 00000000000..7701cb7020c --- /dev/null +++ b/arch/arm/plat-samsung/include/plat/onenand-core.h
@@ -0,0 +1,37 @@
		1	/*
		2	* linux/arch/arm/plat-samsung/onenand-core.h
		3	*
		4	* Copyright (c) 2010 Samsung Electronics
		5	* Kyungmin Park <kyungmin.park@samsung.com>
		6	* Marek Szyprowski <m.szyprowski@samsung.com>
		7	*
		8	* Samsung OneNAD Controller core functions
		9	*
		10	* This program is free software; you can redistribute it and/or modify
		11	* it under the terms of the GNU General Public License version 2 as
		12	* published by the Free Software Foundation.
		13	*/
		14
		15	#ifndef __ASM_ARCH_ONENAND_CORE_H
		16	#define __ASM_ARCH_ONENAND_CORE_H __FILE__
		17
		18	/* These functions are only for use with the core support code, such as
		19	* the cpu specific initialisation code
		20	*/
		21
		22	/* re-define device name depending on support. */
		23	static inline void s3c_onenand_setname(char *name)
		24	{
		25	#ifdef CONFIG_S3C_DEV_ONENAND
		26	s3c_device_onenand.name = name;
		27	#endif
		28	}
		29
		30	static inline void s3c64xx_onenand1_setname(char *name)
		31	{
		32	#ifdef CONFIG_S3C64XX_DEV_ONENAND1
		33	s3c64xx_device_onenand1.name = name;
		34	#endif
		35	}
		36
		37	#endif /* __ASM_ARCH_ONENAND_CORE_H */


diff --git a/arch/arm/plat-samsung/include/plat/regs-onenand.h b/arch/arm/plat-samsung/include/plat/regs-onenand.h new file mode 100644 index 00000000000..930ea8b88ed --- /dev/null +++ b/arch/arm/plat-samsung/include/plat/regs-onenand.h
@@ -0,0 +1,63 @@
		1	/*
		2	* linux/arch/arm/plat-s3c/include/plat/regs-onenand.h
		3	*
		4	* Copyright (C) 2008-2010 Samsung Electronics
		5	* Kyungmin Park <kyungmin.park@samsung.com>
		6	*
		7	* This program is free software; you can redistribute it and/or modify
		8	* it under the terms of the GNU General Public License version 2 as
		9	* published by the Free Software Foundation.
		10	*/
		11	#ifndef __SAMSUNG_ONENAND_H__
		12	#define __SAMSUNG_ONENAND_H__
		13
		14	#include <mach/hardware.h>
		15
		16	/*
		17	* OneNAND Controller
		18	*/
		19	#define MEM_CFG_OFFSET 0x0000
		20	#define BURST_LEN_OFFSET 0x0010
		21	#define MEM_RESET_OFFSET 0x0020
		22	#define INT_ERR_STAT_OFFSET 0x0030
		23	#define INT_ERR_MASK_OFFSET 0x0040
		24	#define INT_ERR_ACK_OFFSET 0x0050
		25	#define ECC_ERR_STAT_OFFSET 0x0060
		26	#define MANUFACT_ID_OFFSET 0x0070
		27	#define DEVICE_ID_OFFSET 0x0080
		28	#define DATA_BUF_SIZE_OFFSET 0x0090
		29	#define BOOT_BUF_SIZE_OFFSET 0x00A0
		30	#define BUF_AMOUNT_OFFSET 0x00B0
		31	#define TECH_OFFSET 0x00C0
		32	#define FBA_WIDTH_OFFSET 0x00D0
		33	#define FPA_WIDTH_OFFSET 0x00E0
		34	#define FSA_WIDTH_OFFSET 0x00F0
		35	#define TRANS_SPARE_OFFSET 0x0140
		36	#define DBS_DFS_WIDTH_OFFSET 0x0160
		37	#define INT_PIN_ENABLE_OFFSET 0x01A0
		38	#define ACC_CLOCK_OFFSET 0x01C0
		39	#define FLASH_VER_ID_OFFSET 0x01F0
		40	#define FLASH_AUX_CNTRL_OFFSET 0x0300 /* s3c64xx only */
		41
		42	#define ONENAND_MEM_RESET_HOT 0x3
		43	#define ONENAND_MEM_RESET_COLD 0x2
		44	#define ONENAND_MEM_RESET_WARM 0x1
		45
		46	#define CACHE_OP_ERR (1 << 13)
		47	#define RST_CMP (1 << 12)
		48	#define RDY_ACT (1 << 11)
		49	#define INT_ACT (1 << 10)
		50	#define UNSUP_CMD (1 << 9)
		51	#define LOCKED_BLK (1 << 8)
		52	#define BLK_RW_CMP (1 << 7)
		53	#define ERS_CMP (1 << 6)
		54	#define PGM_CMP (1 << 5)
		55	#define LOAD_CMP (1 << 4)
		56	#define ERS_FAIL (1 << 3)
		57	#define PGM_FAIL (1 << 2)
		58	#define INT_TO (1 << 1)
		59	#define LD_FAIL_ECC_ERR (1 << 0)
		60
		61	#define TSRF (1 << 0)
		62
		63	#endif