From c76b8bda0b5fc8cceece3b627ebfc5fcb64f5dad Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Tue, 9 Jun 2020 20:27:35 +0000 Subject: [PATCH] Fix boot of wandquad after DTS update In the recent dts sync the name of the aips-bus@ changed to bus@. Reflect this change and add an additional OF_finddevice in fix_fdt_interrupt_data() and in fix_fdt_iomuxc_data() with bus@ only. Iow, keep the old naming for compatibility. Discussed with: ian@ --- sys/arm/freescale/imx/imx6_machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c index b251f0d9f06..c7a531587bc 100644 --- a/sys/arm/freescale/imx/imx6_machdep.c +++ b/sys/arm/freescale/imx/imx6_machdep.c @@ -133,6 +133,8 @@ fix_fdt_interrupt_data(void) gpcnode = OF_finddevice("/soc/aips-bus@02000000/gpc@020dc000"); if (gpcnode == -1) gpcnode = OF_finddevice("/soc/aips-bus@2000000/gpc@20dc000"); + if (gpcnode == -1) + gpcnode = OF_finddevice("/soc/bus@2000000/gpc@20dc000"); if (gpcnode == -1) return; result = OF_getencprop(gpcnode, "interrupt-parent", &gpcipar, @@ -172,6 +174,8 @@ fix_fdt_iomuxc_data(void) * uses for register access. */ node = OF_finddevice("/soc/aips-bus@2000000/iomuxc-gpr@20e0000"); + if (node == -1) + node = OF_finddevice("/soc/bus@2000000/iomuxc-gpr@20e0000"); if (node != -1) OF_setprop(node, "status", "disabled", sizeof("disabled")); }