ARM: Merge for-2635-4/onenand

Merge branch 'for-2635-4/onenand' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/cpu.c
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile

6 files changed, 164 insertions, 0 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 47c8aa75e747..d663078253de 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -201,6 +201,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 d73ee553b46e..d98316b30c26 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_S3C_DEV_USB_HOST)	+= dev-usb.o
 obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
 obj-$(CONFIG_S3C_DEV_WDT)       += dev-wdt.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 000000000000..45ec73287d8c
--- /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 8d516d498051..e6144e4b9118 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -69,6 +69,9 @@ extern struct platform_device s5p6440_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 000000000000..7701cb7020c8
--- /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 000000000000..930ea8b88ed3
--- /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