Commit 2b54057c authored Sep 02, 2014 by Roger Quadros Committed by Tony Lindgren Sep 04, 2014

ARM: OMAP2+: gpmc: Don't complain if wait pin is used without r/w monitoring



For NAND read & write wait pin monitoring must be kept disabled as the
wait pin is only used to indicate NAND device ready status and not to
extend each read/write cycle.

So don't print a warning if wait pin is specified while read/write
monitoring is not in the device tree.

Sanity check wait pin number irrespective if read/write monitoring is
set or not.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Pekon Gupta <pekon@pek-sem.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent e47acd96

arch/arm/mach-omap2/gpmc.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1207,8 +1207,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p)
		}
		}

		if ((p->wait_on_read \|\| p->wait_on_write) &&
		(p->wait_pin > gpmc_nr_waitpins)) {
		if (p->wait_pin > gpmc_nr_waitpins) {
		pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin);
		return -EINVAL;
		}
		@@ -1288,7 +1287,7 @@ void gpmc_read_settings_dt(struct device_node np, struct gpmc_settings p)
		p->wait_on_write = of_property_read_bool(np,
		"gpmc,wait-on-write");
		if (!p->wait_on_read && !p->wait_on_write)
		pr_warn("%s: read/write wait monitoring not enabled!\n",
		pr_debug("%s: rd/wr wait monitoring not enabled!\n",
		__func__);
		}
		}