summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2018-11-18 23:24:19 -0800
committerYe Li <ye.li@nxp.com>2018-11-19 00:56:32 -0800
commit42d8eedc167cfba7f7363c56c176b7f7057e4a0e (patch)
tree8df4b41ea1573b6c67ccec48627a426975939430 /arch
parent30d7fe33ba238bbf2cf0ee6231ee9fe919dd599d (diff)
MLK-20395 DTS: imx: Add alias for usb1 device
Some platforms don't have alias for usb1 device, so when initialize the second controller, its seq is allocated by u-boot automatically. This introduces a problem if the initialization of first controller is failed, for example nothing connect to first controller, then the seq allocated for second controller is 0 not 1. EHCI driver uses the seq as index for USB controller and phy, so it will cause initialization problem for second controller. Fix the issue by adding the usb1 alias for second USB controller. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit fe21a1ab93d0788017ec58905e3273c9ab0f5a67)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/imx6qdl.dtsi1
-rw-r--r--arch/arm/dts/imx6sl.dtsi1
-rw-r--r--arch/arm/dts/imx6sx.dtsi1
-rw-r--r--arch/arm/dts/imx7d.dtsi4
4 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
index 2e5697437e..6221d659a3 100644
--- a/arch/arm/dts/imx6qdl.dtsi
+++ b/arch/arm/dts/imx6qdl.dtsi
@@ -43,6 +43,7 @@
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
usb0 = &usbotg;
+ usb1 = &usbh1;
};
intc: interrupt-controller@00a01000 {
diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi
index 6729fcf04a..ceb87f9d1c 100644
--- a/arch/arm/dts/imx6sl.dtsi
+++ b/arch/arm/dts/imx6sl.dtsi
@@ -44,6 +44,7 @@
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
usb0 = &usbotg1;
+ usb1 = &usbotg2;
};
cpus {
diff --git a/arch/arm/dts/imx6sx.dtsi b/arch/arm/dts/imx6sx.dtsi
index e8875fb0db..aeaacaf074 100644
--- a/arch/arm/dts/imx6sx.dtsi
+++ b/arch/arm/dts/imx6sx.dtsi
@@ -48,6 +48,7 @@
lcdif0 = &lcdif1;
lcdif1 = &lcdif2;
usb0 = &usbotg1;
+ usb1 = &usbotg2;
};
cpus {
diff --git a/arch/arm/dts/imx7d.dtsi b/arch/arm/dts/imx7d.dtsi
index 3a7535ed10..d89a388810 100644
--- a/arch/arm/dts/imx7d.dtsi
+++ b/arch/arm/dts/imx7d.dtsi
@@ -45,6 +45,10 @@
#include "imx7s.dtsi"
/ {
+ aliases {
+ usb1 = &usbotg2;
+ };
+
cpus {
cpu0: cpu@0 {
operating-points = <