summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-x1205.c
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2013-02-18 07:57:39 -0600
committerTony Lindgren <tony@atomide.com>2013-03-04 11:12:16 -0800
commit31d9adca82ce65e5c99d045b5fd917c702b6fce3 (patch)
treeebd4b2cd9340df614447a079bdfb3a54f81b4add /drivers/rtc/rtc-x1205.c
parent0adcbaf78f6267baf4eecc201107d8f8ff3b200c (diff)
ARM: OMAP2+: Fix broken gpmc support
Commit 6797b4fe (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>
Diffstat (limited to 'drivers/rtc/rtc-x1205.c')
0 files changed, 0 insertions, 0 deletions