diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
| commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
| tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /drivers/memory/omap-gpmc.c | |
| parent | e3abe2556b2a689b28926cd1581f0b97e9d2afa4 (diff) | |
| parent | 22a5dc10e3f8fb8370748ea19dc4e3e1620d8296 (diff) | |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'drivers/memory/omap-gpmc.c')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 0e524a1de56d..3a27a84ad3ec 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -403,7 +403,7 @@ static void gpmc_cs_bool_timings(int cs, const struct gpmc_bool_timings *p) p->cycle2cyclediffcsen); } -#ifdef DEBUG +#ifdef CONFIG_OMAP_GPMC_DEBUG /** * get_gpmc_timing_reg - read a timing parameter and print DTS settings for it. * @cs: Chip Select Region @@ -612,7 +612,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max } l = gpmc_cs_read_reg(cs, reg); -#ifdef DEBUG +#ifdef CONFIG_OMAP_GPMC_DEBUG pr_info( "GPMC CS%d: %-17s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", cs, name, ticks, gpmc_get_clk_period(cs, cd) * ticks / 1000, @@ -767,7 +767,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, GPMC_CONFIG1_CLKACTIVATIONTIME_MAX, clk_activation, GPMC_CD_FCLK); -#ifdef DEBUG +#ifdef CONFIG_OMAP_GPMC_DEBUG pr_info("GPMC CS%d CLK period is %lu ns (div %d)\n", cs, (div * gpmc_get_fclk_period()) / 1000, div); #endif |