dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: uniphier: Switch USB node to the original

Browse Source 
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>
This commit is contained in:
Kunihiko Hayashi
2023-02-28 11:37:08 +09:00
committed by Tom Rini
parent 6782b81588
commit e800263d56
4 changed files with 7 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/dts/uniphier-ld20.dtsi
View File

@@ -744,7 +744,7 @@
}; };
}; };
_usb: usb@65a00000 { usb: usb@65a00000 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65a00000 0xcd00>; 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 { pcie: pcie@66000000 {
compatible = "socionext,uniphier-pcie", "snps,dw-pcie"; compatible = "socionext,uniphier-pcie", "snps,dw-pcie";
status = "disabled"; status = "disabled";

42
arch/arm/dts/uniphier-pro4.dtsi
View File

@@ -503,7 +503,7 @@
}; };
}; };
_usb0: usb@65a00000 { usb0: usb@65a00000 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65a00000 0xcd00>; reg = <0x65a00000 0xcd00>;
@@ -556,26 +556,7 @@
}; };
}; };
/* FIXME: U-Boot own node */ usb1: usb@65c00000 {
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 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65c00000 0xcd00>; 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 { nand: nand-controller@68000000 {
compatible = "socionext,uniphier-denali-nand-v5a"; compatible = "socionext,uniphier-denali-nand-v5a";
status = "disabled"; status = "disabled";

42
arch/arm/dts/uniphier-pxs2.dtsi
View File

@@ -593,7 +593,7 @@
}; };
}; };
_usb0: usb@65a00000 { usb0: usb@65a00000 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65a00000 0xcd00>; reg = <0x65a00000 0xcd00>;
@@ -689,26 +689,7 @@
}; };
}; };
/* FIXME: U-Boot own node */ usb1: usb@65c00000 {
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 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65c00000 0xcd00>; 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 { nand: nand-controller@68000000 {
compatible = "socionext,uniphier-denali-nand-v5b"; compatible = "socionext,uniphier-denali-nand-v5b";
status = "disabled"; status = "disabled";

42
arch/arm/dts/uniphier-pxs3.dtsi
View File

@@ -595,7 +595,7 @@
}; };
}; };
_usb0: usb@65a00000 { usb0: usb@65a00000 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65a00000 0xcd00>; reg = <0x65a00000 0xcd00>;
@@ -697,26 +697,7 @@
}; };
}; };
/* FIXME: U-Boot own node */ usb1: usb@65c00000 {
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 {
compatible = "socionext,uniphier-dwc3", "snps,dwc3"; compatible = "socionext,uniphier-dwc3", "snps,dwc3";
status = "disabled"; status = "disabled";
reg = <0x65c00000 0xcd00>; 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 { pcie: pcie@66000000 {
compatible = "socionext,uniphier-pcie", "snps,dw-pcie"; compatible = "socionext,uniphier-pcie", "snps,dw-pcie";
status = "disabled"; status = "disabled";