[PATCH 3/5] ARM: SoCFPGA: arria10-sdram: cleanup emif_reset

[Steffen Trumtrar]

Use the __wait_on_timeout code to poll for EMIF reset.

Be sure to clear EMIF if reset fails before trying again.

Signed-off-by: Steffen Trumtrar <s.trumt...@pengutronix.de>
---
 arch/arm/mach-socfpga/arria10-sdram.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-socfpga/arria10-sdram.c 
b/arch/arm/mach-socfpga/arria10-sdram.c
index 
da7d3ea685e238c8c9abda84976a1161edfc4b03..c28cf50eb55fb97c2dfe52acfbc360784ca3e36b
 100644
--- a/arch/arm/mach-socfpga/arria10-sdram.c
+++ b/arch/arm/mach-socfpga/arria10-sdram.c
@@ -244,13 +244,16 @@ static int emif_reset(void)
 
        writel(CORE2SEQ_INT_REQ, DDR_REG_CORE2SEQ);
 
-       if (ddr_wait_bit(DDR_REG_SEQ2CORE, SEQ2CORE_INT_RESP_BIT, 0, 1000000)) {
+       ret = __wait_on_timeout(1000000, readl(DDR_REG_SEQ2CORE) &
+                               SEQ2CORE_INT_RESP_BIT);
+       if (ret) {
                printf("emif_reset failed to see interrupt acknowledge\n");
+               emif_clear();
                return -2;
-       } else {
-               printf("emif_reset interrupt acknowledged\n");
        }
 
+       __udelay(1000);
+
        ret = emif_clear();
        if (ret) {
                printf("emif_clear() failed\n");

-- 
2.45.2