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/mach-omap2/gpmc.c | |
| 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/mach-omap2/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 149bfba43cf..375ad27479c 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -220,6 +220,11 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access); + if (cpu_is_omap34xx()) { + GPMC_SET_ONE(GPMC_CS_CONFIG6, 16, 19, wr_data_mux_bus); + GPMC_SET_ONE(GPMC_CS_CONFIG6, 24, 28, wr_access); + } + /* caller is expected to have initialized CONFIG1 to cover * at least sync vs async */ |