diff options
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 4aeaa4e79585..c7a48f921fef 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -90,7 +90,7 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns) | |||
90 | 90 | ||
91 | #ifdef DEBUG | 91 | #ifdef DEBUG |
92 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, | 92 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, |
93 | int time, int div, const char *name) | 93 | int time, const char *name) |
94 | #else | 94 | #else |
95 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, | 95 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, |
96 | int time) | 96 | int time) |
@@ -111,7 +111,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, | |||
111 | l = gpmc_cs_read_reg(cs, reg); | 111 | l = gpmc_cs_read_reg(cs, reg); |
112 | #ifdef DEBUG | 112 | #ifdef DEBUG |
113 | printk(KERN_INFO "GPMC CS%d: %-10s: %d ticks, %3lu ns (was %i ticks)\n", | 113 | printk(KERN_INFO "GPMC CS%d: %-10s: %d ticks, %3lu ns (was %i ticks)\n", |
114 | cs, name, ticks, gpmc_get_clk_period(div) * ticks / 1000, | 114 | cs, name, ticks, gpmc_get_fclk_period() * ticks / 1000, |
115 | (l >> st_bit) & mask); | 115 | (l >> st_bit) & mask); |
116 | #endif | 116 | #endif |
117 | l &= ~(mask << st_bit); | 117 | l &= ~(mask << st_bit); |
@@ -176,8 +176,8 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) | |||
176 | GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access); | 176 | GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access); |
177 | 177 | ||
178 | #ifdef DEBUG | 178 | #ifdef DEBUG |
179 | printk(KERN_INFO "GPMC CLK period is %d (div %d)\n", | 179 | printk(KERN_INFO "GPMC CS%d CLK period is %lu (div %d)\n", |
180 | cs, get_gpmc_clk_period(div), div); | 180 | cs, gpmc_get_fclk_period(), div); |
181 | #endif | 181 | #endif |
182 | 182 | ||
183 | l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1); | 183 | l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1); |