[PATCH 1/2] ARM: dts: uniphier: Switch USB node to the original

Kunihiko Hayashi
2023-02-28T02:37:41Z

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>
---
arch/arm/dts/uniphier-ld20.dtsi | 21 +----------------
arch/arm/dts/uniphier-pro4.dtsi | 42 ++-------------------------------
arch/arm/dts/uniphier-pxs2.dtsi | 42 ++-------------------------------
arch/arm/dts/uniphier-pxs3.dtsi | 42 ++-------------------------------
4 files changed, 7 insertions(+), 140 deletions(-)

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 4549935c42..1aad4cff5b 100644
--- 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 9dae4e9b23..cd706f485e 100644
--- 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 7a8b6c10f4..0364bdce7e 100644
--- 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 004656c992..410bf51e52 100644
--- 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";
--
2.25.1