]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6782b81)
ARM: dts: uniphier: Switch USB node to the original
authorKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Tue, 28 Feb 2023 02:37:08 +0000 (11:37 +0900)
committerTom Rini <trini@konsulko.com>
Mon, 6 Mar 2023 22:05:40 +0000 (17:05 -0500)
UniPhier DT applies its own USB node for U-Boot due to the USB driver
constrains. After solving this issue, u-boot allows the original USB node.

After switching USB node, synchronization of USB node with Linux becomes
possible.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: Marek Vasut <marex@denx.de>
arch/arm/dts/uniphier-ld20.dtsi patch | blob | history
arch/arm/dts/uniphier-pro4.dtsi patch | blob | history
arch/arm/dts/uniphier-pxs2.dtsi patch | blob | history
arch/arm/dts/uniphier-pxs3.dtsi patch | blob | history

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 4549935c421baaf03af75d053e8178a349994c18..1aad4cff5bc9c916567f1c2f9888835944199206 100644 (file)
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -744,7 +744,7 @@
                        };
                };
 
-               _usb: usb@65a00000 {
+               usb: usb@65a00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
@@ -894,25 +894,6 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb: usb@65b00000 {
-                       compatible = "socionext,uniphier-ld20-dwc3";
-                       reg = <0x65b00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb1>,
-                                   <&pinctrl_usb2>, <&pinctrl_usb3>;
-                       dwc3@65a00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65a00000 0x10000>;
-                               interrupts = <0 134 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
                pcie: pcie@66000000 {
                        compatible = "socionext,uniphier-pcie", "snps,dw-pcie";
                        status = "disabled";
diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 9dae4e9b23fd5d07a4b2d46d219a17b99e26aa17..cd706f485e6b7977aac1e8b04463ff81847c3bee 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -503,7 +503,7 @@
                        };
                };
 
-               _usb0: usb@65a00000 {
+               usb0: usb@65a00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
@@ -556,26 +556,7 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb0: usb@65b00000 {
-                       compatible = "socionext,uniphier-pro4-dwc3";
-                       status = "disabled";
-                       reg = <0x65b00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb0>;
-                       dwc3@65a00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65a00000 0x10000>;
-                               interrupts = <0 134 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
-               _usb1: usb@65c00000 {
+               usb1: usb@65c00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65c00000 0xcd00>;
@@ -617,25 +598,6 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb1: usb@65d00000 {
-                       compatible = "socionext,uniphier-pro4-dwc3";
-                       status = "disabled";
-                       reg = <0x65d00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb1>;
-                       dwc3@65c00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65c00000 0x10000>;
-                               interrupts = <0 137 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
                nand: nand-controller@68000000 {
                        compatible = "socionext,uniphier-denali-nand-v5a";
                        status = "disabled";
diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi
index 7a8b6c10f4dc51242ced4dbfa956ac5370487be0..0364bdce7ec24ff7bb4b66fbb084b58d8bc47dd0 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/dts/uniphier-pxs2.dtsi
@@ -593,7 +593,7 @@
                        };
                };
 
-               _usb0: usb@65a00000 {
+               usb0: usb@65a00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
@@ -689,26 +689,7 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb0: usb@65b00000 {
-                       compatible = "socionext,uniphier-pxs2-dwc3";
-                       status = "disabled";
-                       reg = <0x65b00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;
-                       dwc3@65a00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65a00000 0x10000>;
-                               interrupts = <0 134 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
-               _usb1: usb@65c00000 {
+               usb1: usb@65c00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65c00000 0xcd00>;
@@ -792,25 +773,6 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb1: usb@65d00000 {
-                       compatible = "socionext,uniphier-pxs2-dwc3";
-                       status = "disabled";
-                       reg = <0x65d00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;
-                       dwc3@65c00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65c00000 0x10000>;
-                               interrupts = <0 137 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
                nand: nand-controller@68000000 {
                        compatible = "socionext,uniphier-denali-nand-v5b";
                        status = "disabled";
diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index 004656c992b7504699be8e9874f2a09245a79594..410bf51e52889818f5dec31019a5fc8452e6da55 100644 (file)
--- a/arch/arm/dts/uniphier-pxs3.dtsi
+++ b/arch/arm/dts/uniphier-pxs3.dtsi
@@ -595,7 +595,7 @@
                        };
                };
 
-               _usb0: usb@65a00000 {
+               usb0: usb@65a00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
@@ -697,26 +697,7 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb0: usb@65b00000 {
-                       compatible = "socionext,uniphier-pxs3-dwc3";
-                       status = "disabled";
-                       reg = <0x65b00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;
-                       dwc3@65a00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65a00000 0x10000>;
-                               interrupts = <0 134 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
-               _usb1: usb@65c00000 {
+               usb1: usb@65c00000 {
                        compatible = "socionext,uniphier-dwc3", "snps,dwc3";
                        status = "disabled";
                        reg = <0x65c00000 0xcd00>;
@@ -810,25 +791,6 @@
                        };
                };
 
-               /* FIXME: U-Boot own node */
-               usb1: usb@65d00000 {
-                       compatible = "socionext,uniphier-pxs3-dwc3";
-                       status = "disabled";
-                       reg = <0x65d00000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;
-                       dwc3@65c00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x65c00000 0x10000>;
-                               interrupts = <0 137 4>;
-                               dr_mode = "host";
-                               tx-fifo-resize;
-                       };
-               };
-
                pcie: pcie@66000000 {
                        compatible = "socionext,uniphier-pcie", "snps,dw-pcie";
                        status = "disabled";
My U-Boot fork