diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
| commit | 59aaade72544ad1be4183c1066c20b5883a78717 (patch) | |
| tree | da57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/plat-omap/include/mach/gpmc.h | |
| parent | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff) | |
| parent | 99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/gpmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/gpmc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h index 3c7b425c585..45b678439bb 100644 --- a/arch/arm/plat-omap/include/mach/gpmc.h +++ b/arch/arm/plat-omap/include/mach/gpmc.h @@ -84,6 +84,10 @@ struct gpmc_timings { u16 access; /* Start-cycle to first data valid delay */ u16 rd_cycle; /* Total read cycle time */ u16 wr_cycle; /* Total write cycle time */ + + /* The following are only on OMAP3430 */ + u16 wr_access; /* WRACCESSTIME */ + u16 wr_data_mux_bus; /* WRDATAONADMUXBUS */ }; extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns); |