]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: OMAP2+: Fix broken gpmc support
authorJon Hunter <jon-hunter@ti.com>
Mon, 18 Feb 2013 13:57:39 +0000 (07:57 -0600)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Mar 2013 19:12:16 +0000 (11:12 -0800)
commitd650dbb6d0e5f17be231905bf772f8ea008f5cc5
treeebd4b2cd9340df614447a079bdfb3a54f81b4add
parent25fb307f0f0b962197ab5442b874d8d5124a624b
ARM: OMAP2+: Fix broken gpmc support

Commit 41904c58 (ARM: OMAP2+: Prevent potential crash if GPMC probe fails)
added code to ensure that GPMC chip-selects could not be requested until the
device probe was successful. The chip-selects should have been
unreserved at the end of the probe function, but the code to unreserve
them appears to have ended up in the gpmc_calc_timings() function and
hence, this is causing problems requesting chip-selects. Fix this merge
error by unreserving the chip-selects at the end of the probe, but
before we call the gpmc child probe functions (for device-tree) which
request a chip-select.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Philip Avinash <avinashphilip@ti.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
[tony@atomide.com: updated description to add breaking commit id]
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/gpmc.c