2020-10-14 10:18:53

by Peng Fan

Subject: [PATCH] ARM: dts: imx: add usb alias

From: Peng Fan <[email protected]>

Add usb alias for bootloader emulator the controller in correct order.

Signed-off-by: Peng Fan <[email protected]>
---
arch/arm/boot/dts/imx6qdl.dtsi | 4 ++++
arch/arm/boot/dts/imx6sl.dtsi | 3 +++
arch/arm/boot/dts/imx6sll.dtsi | 2 ++
arch/arm/boot/dts/imx6sx.dtsi | 3 +++
arch/arm/boot/dts/imx6ul.dtsi | 2 ++
arch/arm/boot/dts/imx7d.dtsi | 6 ++++++
arch/arm/boot/dts/imx7s.dtsi | 2 ++
7 files changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 7a8837cbe21b..947584b40b1f 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -45,6 +45,10 @@ aliases {
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usb0 = &usbotg;
+ usb1 = &usbh1;
+ usb2 = &usbh2;
+ usb3 = &usbh3;
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
};
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 91a8c54d5e11..997b96c1c47b 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -39,6 +39,9 @@ aliases {
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usb0 = &usbotg1;
+ usb1 = &usbotg2;
+ usb2 = &usbh;
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
};
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 0b622201a1f3..04f8d637a501 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -36,6 +36,8 @@ aliases {
spi1 = &ecspi2;
spi3 = &ecspi3;
spi4 = &ecspi4;
+ usb0 = &usbotg1;
+ usb1 = &usbotg2;
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index dfdca1804f9f..343f2a3170bb 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -49,6 +49,9 @@ aliases {
spi2 = &ecspi3;
spi3 = &ecspi4;
spi4 = &ecspi5;
+ usb0 = &usbotg1;
+ usb1 = &usbotg2;
+ usb2 = &usbh;
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
};
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d7d9f3e46b92..09021a35c266 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -47,6 +47,8 @@ aliases {
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usb0 = &usbotg1;
+ usb1 = &usbotg2;
usbphy0 = &usbphy1;
usbphy1 = &usbphy2;
};
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index cff875b80b60..b0bcfa9094a3 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -7,6 +7,12 @@
#include <dt-bindings/reset/imx7-reset.h>

/ {
+ aliases {
+ usb0 = &usbotg1;
+ usb1 = &usbotg2;
+ usb2 = &usbh;
+ };
+
cpus {
cpu0: cpu@0 {
clock-frequency = <996000000>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 84d9cc13afb9..358ef453ce14 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -47,6 +47,8 @@ aliases {
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usb0 = &usbotg1;
+ usb1 = &usbh;
};

cpus {
--
2.28.0

2020-10-31 07:52:32

by Shawn Guo

Subject: Re: [PATCH] ARM: dts: imx: add usb alias

On Wed, Oct 14, 2020 at 09:27:41AM +0800, [email protected] wrote:
> From: Peng Fan <[email protected]>
>
> Add usb alias for bootloader emulator the controller in correct order.

emulator? Not sure what that means.

Shawn

>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> arch/arm/boot/dts/imx6qdl.dtsi | 4 ++++
> arch/arm/boot/dts/imx6sl.dtsi | 3 +++
> arch/arm/boot/dts/imx6sll.dtsi | 2 ++
> arch/arm/boot/dts/imx6sx.dtsi | 3 +++
> arch/arm/boot/dts/imx6ul.dtsi | 2 ++
> arch/arm/boot/dts/imx7d.dtsi | 6 ++++++
> arch/arm/boot/dts/imx7s.dtsi | 2 ++
> 7 files changed, 22 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 7a8837cbe21b..947584b40b1f 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -45,6 +45,10 @@ aliases {
> spi1 = &ecspi2;
> spi2 = &ecspi3;
> spi3 = &ecspi4;
> + usb0 = &usbotg;
> + usb1 = &usbh1;
> + usb2 = &usbh2;
> + usb3 = &usbh3;
> usbphy0 = &usbphy1;
> usbphy1 = &usbphy2;
> };
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index 91a8c54d5e11..997b96c1c47b 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -39,6 +39,9 @@ aliases {
> spi1 = &ecspi2;
> spi2 = &ecspi3;
> spi3 = &ecspi4;
> + usb0 = &usbotg1;
> + usb1 = &usbotg2;
> + usb2 = &usbh;
> usbphy0 = &usbphy1;
> usbphy1 = &usbphy2;
> };
> diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
> index 0b622201a1f3..04f8d637a501 100644
> --- a/arch/arm/boot/dts/imx6sll.dtsi
> +++ b/arch/arm/boot/dts/imx6sll.dtsi
> @@ -36,6 +36,8 @@ aliases {
> spi1 = &ecspi2;
> spi3 = &ecspi3;
> spi4 = &ecspi4;
> + usb0 = &usbotg1;
> + usb1 = &usbotg2;
> usbphy0 = &usbphy1;
> usbphy1 = &usbphy2;
> };
> diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
> index dfdca1804f9f..343f2a3170bb 100644
> --- a/arch/arm/boot/dts/imx6sx.dtsi
> +++ b/arch/arm/boot/dts/imx6sx.dtsi
> @@ -49,6 +49,9 @@ aliases {
> spi2 = &ecspi3;
> spi3 = &ecspi4;
> spi4 = &ecspi5;
> + usb0 = &usbotg1;
> + usb1 = &usbotg2;
> + usb2 = &usbh;
> usbphy0 = &usbphy1;
> usbphy1 = &usbphy2;
> };
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index d7d9f3e46b92..09021a35c266 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -47,6 +47,8 @@ aliases {
> spi1 = &ecspi2;
> spi2 = &ecspi3;
> spi3 = &ecspi4;
> + usb0 = &usbotg1;
> + usb1 = &usbotg2;
> usbphy0 = &usbphy1;
> usbphy1 = &usbphy2;
> };
> diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
> index cff875b80b60..b0bcfa9094a3 100644
> --- a/arch/arm/boot/dts/imx7d.dtsi
> +++ b/arch/arm/boot/dts/imx7d.dtsi
> @@ -7,6 +7,12 @@
> #include <dt-bindings/reset/imx7-reset.h>
>
> / {
> + aliases {
> + usb0 = &usbotg1;
> + usb1 = &usbotg2;
> + usb2 = &usbh;
> + };
> +
> cpus {
> cpu0: cpu@0 {
> clock-frequency = <996000000>;
> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> index 84d9cc13afb9..358ef453ce14 100644
> --- a/arch/arm/boot/dts/imx7s.dtsi
> +++ b/arch/arm/boot/dts/imx7s.dtsi
> @@ -47,6 +47,8 @@ aliases {
> spi1 = &ecspi2;
> spi2 = &ecspi3;
> spi3 = &ecspi4;
> + usb0 = &usbotg1;
> + usb1 = &usbh;
> };
>
> cpus {
> --
> 2.28.0
>