forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: OMAP2+: gpmc: Print error message in set_gpmc_timing_reg()

Browse source 
Simplify set_gpmc_timing_reg() and always print error message
if the requested timing cannot be achieved due to a too fast
GPMC functional clock, irrespective if whether DEBUG is defined
or not. This should help us debug timing configuration issues,
which were otherwise simply not being displayed in the kernel log.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Roger Quadros 2014-08-29 19:11:50 +03:00
parent f114040e3e
commit 80323742ea
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/mach-omap2/gpmc.c
View file

@ -283,13 +283,8 @@ static void gpmc_cs_bool_timings(int cs, const struct gpmc_bool_timings *p)
p->cycle2cyclediffcsen); p->cycle2cyclediffcsen);
} }
#ifdef DEBUG
static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
int time, const char *name) int time, const char *name)
#else
static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
int time)
#endif
{ {
u32 l; u32 l;
int ticks, mask, nr_bits; int ticks, mask, nr_bits;
@ -299,15 +294,15 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
else else
ticks = gpmc_ns_to_ticks(time); ticks = gpmc_ns_to_ticks(time);
nr_bits = end_bit - st_bit + 1; nr_bits = end_bit - st_bit + 1;
if (ticks >= 1 << nr_bits) { mask = (1 << nr_bits) - 1;
#ifdef DEBUG
printk(KERN_INFO "GPMC CS%d: %-10s* %3d ns, %3d ticks >= %d\n", if (ticks > mask) {
cs, name, time, ticks, 1 << nr_bits); pr_err("%s: GPMC error! CS%d: %s: %d ns, %d ticks > %d\n",
#endif __func__, cs, name, time, ticks, mask);
return -1; return -1;
} }
mask = (1 << nr_bits) - 1;
l = gpmc_cs_read_reg(cs, reg); l = gpmc_cs_read_reg(cs, reg);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO printk(KERN_INFO
@ -322,16 +317,10 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
return 0; return 0;
} }
#ifdef DEBUG
#define GPMC_SET_ONE(reg, st, end, field) \ #define GPMC_SET_ONE(reg, st, end, field) \
if (set_gpmc_timing_reg(cs, (reg), (st), (end), \ if (set_gpmc_timing_reg(cs, (reg), (st), (end), \
t->field, #field) < 0) \ t->field, #field) < 0) \
return -1 return -1
#else
#define GPMC_SET_ONE(reg, st, end, field) \
if (set_gpmc_timing_reg(cs, (reg), (st), (end), t->field) < 0) \
return -1
#endif
int gpmc_calc_divider(unsigned int sync_clk) int gpmc_calc_divider(unsigned int sync_clk)
{ {