mtd/drivers/mtd/onenand Kconfig, 1.1, 1.2 omap-onenand.c, 1.1,
1.2 onenand_base.c, 1.1, 1.2
kyungmin.park at samsung.com
kyungmin.park at samsung.com
Sat Sep 3 02:07:19 EDT 2005
Update of /home/cvs/mtd/drivers/mtd/onenand
In directory phoenix.infradead.org:/tmp/cvs-serv6919/drivers/mtd/onenand
Modified Files:
Kconfig omap-onenand.c onenand_base.c
Log Message:
[PATCH] OneNAND: Sync. Burst Read support
- OneNAND Sync. Burst Read support
- It is tested with OMAP platform
Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/onenand/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Kconfig 11 Jul 2005 10:39:27 -0000 1.1
+++ Kconfig 3 Sep 2005 06:07:15 -0000 1.2
@@ -29,4 +29,10 @@
help
Support for OneNAND flash on TI OMAP board.
+config MTD_ONENAND_SYNC_READ
+ bool "OneNAND Sync. Burst Read Support"
+ depends on ARCH_OMAP
+ help
+ This enables support for Sync. Burst Read.
+
endmenu
Index: omap-onenand.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/onenand/omap-onenand.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- omap-onenand.c 11 Jul 2005 10:39:27 -0000 1.1
+++ omap-onenand.c 3 Sep 2005 06:07:15 -0000 1.2
@@ -25,9 +25,10 @@
#include <asm/arch/hardware.h>
#include <asm/arch/tc.h>
#include <asm/sizes.h>
+#include <asm/mach-types.h>
#define OMAP_ONENAND_FLASH_START1 OMAP_CS2A_PHYS
-#define OMAP_ONENAND_FLASH_START2 OMAP_CS0_PHYS
+#define OMAP_ONENAND_FLASH_START2 omap_cs3_phys()
/*
* MTD structure for OMAP board
*/
@@ -68,10 +69,66 @@
},
};
-const char *part_probes[] = { "cmdlinepart", NULL, };
+static const char *part_probes[] = { "cmdlinepart", NULL, };
#endif
+#ifdef CONFIG_MTD_ONENAND_SYNC_READ
+static unsigned int omap_emifs_cs;
+
+static void omap_find_emifs_cs(unsigned int addr)
+{
+ /* Check CS3 */
+ if (OMAP_EMIFS_CONFIG_REG & OMAP_EMIFS_CONFIG_BM && addr == 0x0) {
+ omap_emifs_cs = 3;
+ } else {
+ omap_emifs_cs = (addr >> 26);
+ }
+}
+
+/**
+ * omap_onenand_mmcontrol - Control OMAP EMIFS
+ */
+static void omap_onenand_mmcontrol(struct mtd_info *mtd, int sync_read)
+{
+ struct onenand_chip *this = mtd->priv;
+ static unsigned long omap_emifs_ccs, omap_emifs_acs;
+ static unsigned long onenand_sys_cfg1;
+ int config, emifs_ccs, emifs_acs;
+
+ if (sync_read) {
+ /*
+ * Note: BRL and RDWST is equal
+ */
+ omap_emifs_ccs = EMIFS_CCS(omap_emifs_cs);
+ omap_emifs_acs = EMIFS_ACS(omap_emifs_cs);
+
+ emifs_ccs = 0x41141;
+ emifs_acs = 0x1;
+
+ /* OneNAND System Configuration 1 */
+ onenand_sys_cfg1 = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
+ config = (onenand_sys_cfg1
+ & ~(0x3f << ONENAND_SYS_CFG1_BL_SHIFT))
+ | ONENAND_SYS_CFG1_SYNC_READ
+ | ONENAND_SYS_CFG1_BRL_4
+ | ONENAND_SYS_CFG1_BL_8;
+ } else {
+ emifs_ccs = omap_emifs_ccs;
+ emifs_acs = omap_emifs_acs;
+ config = onenand_sys_cfg1;
+ }
+
+ this->write_word(config, this->base + ONENAND_REG_SYS_CFG1);
+ EMIFS_CCS(omap_emifs_cs) = emifs_ccs;
+ EMIFS_ACS(omap_emifs_cs) = emifs_acs;
+}
+#else
+#define omap_find_emifs_cs(x) do { } while (0)
+#define omap_onenand_mmcontrol NULL
+#endif
+
+
/* Scan to find existance of the device at base.
This also allocates oob and data internal buffers */
static char onenand_name[] = "onenand";
@@ -102,14 +159,19 @@
/* Link the private data with the MTD structure */
omap_onenand_mtd->priv = this;
+ this->mmcontrol = omap_onenand_mmcontrol;
/* try the first address */
this->base = ioremap(OMAP_ONENAND_FLASH_START1, SZ_128K);
+ omap_find_emifs_cs(OMAP_ONENAND_FLASH_START1);
+
omap_onenand_mtd->name = onenand_name;
if (onenand_scan(omap_onenand_mtd, 1)){
/* try the second address */
iounmap(this->base);
this->base = ioremap(OMAP_ONENAND_FLASH_START2, SZ_128K);
+ omap_find_emifs_cs(OMAP_ONENAND_FLASH_START2);
+
if (onenand_scan(omap_onenand_mtd, 1)) {
iounmap(this->base);
err = -ENXIO;
Index: onenand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/onenand/onenand_base.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- onenand_base.c 11 Jul 2005 10:39:27 -0000 1.1
+++ onenand_base.c 3 Sep 2005 06:07:15 -0000 1.2
@@ -379,6 +379,35 @@
}
/**
+ * onenand_sync_read_bufferram - [OneNAND Interface] Read the bufferram area with Sync. Burst mode
+ * @param mtd MTD data structure
+ * @param area BufferRAM area
+ * @param buffer the databuffer to put/get data
+ * @param offset offset to read from or write to
+ * @param count number of bytes to read/write
+ *
+ * Read the BufferRAM area with Sync. Burst Mode
+ */
+static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,
+ unsigned char *buffer, int offset, size_t count)
+{
+ struct onenand_chip *this = mtd->priv;
+ void __iomem *bufferram;
+
+ bufferram = this->base + area;
+
+ bufferram += onenand_bufferram_offset(mtd, area);
+
+ this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
+
+ memcpy(buffer, bufferram + offset, count);
+
+ this->mmcontrol(mtd, 0);
+
+ return 0;
+}
+
+/**
* onenand_write_bufferram - [OneNAND Interface] Write the bufferram area
* @param mtd MTD data structure
* @param area BufferRAM area
@@ -1273,8 +1302,8 @@
break;
}
- printk(KERN_DEBUG "OneNAND Manufacturer: %s\n",
- onenand_manuf_ids[i].name);
+ printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n",
+ onenand_manuf_ids[i].name, manuf);
return (i != ONENAND_MFR_UNKNOWN);
}
@@ -1385,6 +1414,12 @@
if (onenand_probe(mtd))
return -ENXIO;
+ /* Set Sync. Burst Read after probing */
+ if (this->mmcontrol) {
+ printk(KERN_INFO "OneNAND Sync. Burst Read support\n");
+ this->read_bufferram = onenand_sync_read_bufferram;
+ }
+
this->state = FL_READY;
init_waitqueue_head(&this->wq);
spin_lock_init(&this->chip_lock);
More information about the linux-mtd-cvs
mailing list