MLK-14586: ARM: imx: Fix path to serial port for pm save/restore

The imx7 sleep code will save and restore UART1 registers on
suspend/resume. It does this by fetching the address base using an
absolute devicetree path. Fix that path in 4.9 where the DTS is closer
to the one in upstream.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

diff --git a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c
index 768a00e..540bc8e 100644 (file)
--- a/arch/arm/mach-imx/pm-imx7.c
+++ b/arch/arm/mach-imx/pm-imx7.c
@@ -1178,7 +1178,7 @@ void __init imx7d_pm_init(void)
        WARN_ON(!ocram_saved_in_ddr);
 
        np = of_find_node_by_path(
-               "/soc/aips-bus@30800000/spba-bus@30800000/serial@30860000");
+               "/soc/aips-bus@30800000/serial@30860000");
        if (np)
                console_base = of_iomap(np, 0);