Author: andreast
Date: Tue Jun 9 20:27:35 2020
New Revision: 361985
URL: https://svnweb.freebsd.org/changeset/base/361985
Log:
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@
Modified:
head/sys/arm/freescale/imx/imx6_machdep.c
Modified: head/sys/arm/freescale/imx/imx6_machdep.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_machdep.c Tue Jun 9 20:19:11 2020
(r361984)
+++ head/sys/arm/freescale/imx/imx6_machdep.c Tue Jun 9 20:27:35 2020
(r361985)
@@ -134,6 +134,8 @@ fix_fdt_interrupt_data(void)
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,
sizeof(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"));
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
