summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/openocd.texi3
-rw-r--r--src/flash/nand/Makefile.am1
-rw-r--r--src/flash/nand/driver.c2
-rw-r--r--src/flash/nand/s3c6400.c76
4 files changed, 81 insertions, 1 deletions
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 44460462..a0fc0fb6 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -5041,7 +5041,8 @@ change any behavior.
@deffnx {NAND Driver} s3c2412
@deffnx {NAND Driver} s3c2440
@deffnx {NAND Driver} s3c2443
-These S3C24xx family controllers don't have any special
+@deffnx {NAND Driver} s3c6400
+These S3C family controllers don't have any special
@command{nand device} options, and don't define any
specialized commands.
At this writing, their drivers don't include @code{write_page}
diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 2ffa4c49..a495dfdc 100644
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -25,6 +25,7 @@ NAND_DRIVERS = \
s3c2412.c \
s3c2440.c \
s3c2443.c \
+ s3c6400.c \
at91sam9.c
noinst_HEADERS = \
diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c
index 0e174b23..1c28dbc8 100644
--- a/src/flash/nand/driver.c
+++ b/src/flash/nand/driver.c
@@ -36,6 +36,7 @@ extern struct nand_flash_controller s3c2410_nand_controller;
extern struct nand_flash_controller s3c2412_nand_controller;
extern struct nand_flash_controller s3c2440_nand_controller;
extern struct nand_flash_controller s3c2443_nand_controller;
+extern struct nand_flash_controller s3c6400_nand_controller;
extern struct nand_flash_controller imx31_nand_flash_controller;
extern struct nand_flash_controller at91sam9_nand_controller;
@@ -51,6 +52,7 @@ static struct nand_flash_controller *nand_flash_controllers[] =
&s3c2412_nand_controller,
&s3c2440_nand_controller,
&s3c2443_nand_controller,
+ &s3c6400_nand_controller,
&imx31_nand_flash_controller,
&at91sam9_nand_controller,
/* &boundary_scan_nand_controller, */
diff --git a/src/flash/nand/s3c6400.c b/src/flash/nand/s3c6400.c
new file mode 100644
index 00000000..20b6cc17
--- /dev/null
+++ b/src/flash/nand/s3c6400.c
@@ -0,0 +1,76 @@
+/***************************************************************************
+ * Copyright (C) 2010 by Peter Korsgaard <jacmet@sunsite.dk> *
+ * Heavily based on s3c2412.c by Ben Dooks <ben@fluff.org> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "s3c24xx.h"
+/* s3c64xx uses another base address for the nand controller than 24xx */
+#undef S3C2410_NFREG
+#define S3C2410_NFREG(x) ((x) + 0x70200000)
+
+NAND_DEVICE_COMMAND_HANDLER(s3c6400_nand_device_command)
+{
+ struct s3c24xx_nand_controller *info;
+ CALL_S3C24XX_DEVICE_COMMAND(nand, &info);
+
+ /* fill in the address fields for the core device */
+ info->cmd = S3C2440_NFCMD;
+ info->addr = S3C2440_NFADDR;
+ info->data = S3C2440_NFDATA;
+ info->nfstat = S3C2412_NFSTAT;
+
+ return ERROR_OK;
+}
+
+static int s3c6400_init(struct nand_device *nand)
+{
+ struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
+ struct target *target = s3c24xx_info->target;
+
+ target_write_u32(target, S3C2410_NFCONF,
+ S3C2440_NFCONF_TACLS(3) |
+ S3C2440_NFCONF_TWRPH0(7) |
+ S3C2440_NFCONF_TWRPH1(7) | 4);
+
+ target_write_u32(target, S3C2440_NFCONT,
+ S3C2412_NFCONT_INIT_MAIN_ECC |
+ S3C2440_NFCONT_ENABLE);
+
+ return ERROR_OK;
+}
+
+struct nand_flash_controller s3c6400_nand_controller = {
+ .name = "s3c6400",
+ .nand_device_command = &s3c6400_nand_device_command,
+ .init = &s3c6400_init,
+ .reset = &s3c24xx_reset,
+ .command = &s3c24xx_command,
+ .address = &s3c24xx_address,
+ .write_data = &s3c24xx_write_data,
+ .read_data = &s3c24xx_read_data,
+ .write_page = s3c24xx_write_page,
+ .read_page = s3c24xx_read_page,
+ .write_block_data = &s3c2440_write_block_data,
+ .read_block_data = &s3c2440_read_block_data,
+ .controller_ready = &s3c24xx_controller_ready,
+ .nand_ready = &s3c2440_nand_ready,
+ };