aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Karicheri <m-karicheri2@ti.com>2012-04-17 17:02:50 -0400
committerCyril Chemparathy <cyril@ti.com>2012-09-21 10:44:06 -0400
commite43749d90ac691dcc0c8eca02e31da10f77bfed0 (patch)
tree0445f8cf87f3ef1a151c0a354d37c8c491d166bc
parent54ef16d755e66621b79f605bc7661eee69fdf97b (diff)
downloadlinux-keystone-e43749d90ac691dcc0c8eca02e31da10f77bfed0.tar.gz
tci6614: fix the max values of aemif timings
The max values currently set in board file is in aemif clock cycles but it should be in nano seconds. Also change the type of wstrobe and rstrobe to u16 Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
-rw-r--r--arch/arm/mach-davinci/board-tci6614-evm.c14
-rw-r--r--arch/arm/mach-davinci/include/mach/aemif.h6
2 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-davinci/board-tci6614-evm.c b/arch/arm/mach-davinci/board-tci6614-evm.c
index b1555a2759e72..0ad1a6d42b86c 100644
--- a/arch/arm/mach-davinci/board-tci6614-evm.c
+++ b/arch/arm/mach-davinci/board-tci6614-evm.c
@@ -64,13 +64,13 @@ static struct mtd_partition nand_partitions[] = {
};
static struct davinci_aemif_timing evm_nandflash_timing = {
- .wsetup = 0xf,
- .wstrobe = 0x3f,
- .whold = 0x7,
- .rsetup = 0xf,
- .rstrobe = 0x3f,
- .rhold = 7,
- .ta = 3,
+ .wsetup = 96,
+ .wstrobe = 390,
+ .whold = 48,
+ .rsetup = 96,
+ .rstrobe = 390,
+ .rhold = 48,
+ .ta = 24,
};
static struct davinci_nand_pdata nand_config = {
diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/arch/arm/mach-davinci/include/mach/aemif.h
index 05b2934430972..8a34a58735994 100644
--- a/arch/arm/mach-davinci/include/mach/aemif.h
+++ b/arch/arm/mach-davinci/include/mach/aemif.h
@@ -20,14 +20,12 @@
/* All timings in nanoseconds */
struct davinci_aemif_timing {
+ u16 wstrobe;
+ u16 rstrobe;
u8 wsetup;
- u8 wstrobe;
u8 whold;
-
u8 rsetup;
- u8 rstrobe;
u8 rhold;
-
u8 ta;
};