From 89fbac9fa276aa290c1317c0f6a891ce907711e5 Mon Sep 17 00:00:00 2001 From: patrick Date: Fri, 5 Nov 2021 09:36:30 +0000 Subject: [PATCH] Newer i.MX device trees retriee the USB phy using the more generic property name "phys". To handle those, make sure that we look it up and in case it's not there fall back to "fsl,usbphy". ok kettenis@ --- sys/dev/fdt/imxehci.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/fdt/imxehci.c b/sys/dev/fdt/imxehci.c index 81e149a54b6..9328fb9a671 100644 --- a/sys/dev/fdt/imxehci.c +++ b/sys/dev/fdt/imxehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxehci.c,v 1.4 2020/04/27 20:15:41 patrick Exp $ */ +/* $OpenBSD: imxehci.c,v 1.5 2021/11/05 09:36:30 patrick Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt * @@ -130,9 +130,12 @@ imxehci_attach(struct device *parent, struct device *self, void *aux) if (faa->fa_nreg < 1) return; - if (OF_getpropintarray(faa->fa_node, "fsl,usbphy", - phy, sizeof(phy)) != sizeof(phy)) - return; + if (OF_getpropintarray(faa->fa_node, "phys", + phy, sizeof(phy)) != sizeof(phy)) { + if (OF_getpropintarray(faa->fa_node, "fsl,usbphy", + phy, sizeof(phy)) != sizeof(phy)) + return; + } if (OF_getpropintarray(faa->fa_node, "fsl,usbmisc", misc, sizeof(misc)) != sizeof(misc)) -- 2.20.1