Commit 1f958f3d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"

This reverts commit eb9b7bfd as it
breaks working userspace implementations (i.e. Android systems)

The device node name here is part of configfs, so it is a user-visable
api that can not be changed.
Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/CALAqxLX_FNvFndEDWtGbFPjSzuAbfqxQE07diBJFZtftwEJX5A@mail.gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d53dc388
...@@ -1063,7 +1063,7 @@ &usb2 { ...@@ -1063,7 +1063,7 @@ &usb2 {
status = "okay"; status = "okay";
extcon = <&usb2_id>; extcon = <&usb2_id>;
usb@7600000 { dwc3@7600000 {
extcon = <&usb2_id>; extcon = <&usb2_id>;
dr_mode = "otg"; dr_mode = "otg";
maximum-speed = "high-speed"; maximum-speed = "high-speed";
...@@ -1074,7 +1074,7 @@ &usb3 { ...@@ -1074,7 +1074,7 @@ &usb3 {
status = "okay"; status = "okay";
extcon = <&usb3_id>; extcon = <&usb3_id>;
usb@6a00000 { dwc3@6a00000 {
extcon = <&usb3_id>; extcon = <&usb3_id>;
dr_mode = "otg"; dr_mode = "otg";
}; };
......
...@@ -443,7 +443,7 @@ usb_0: usb@8af8800 { ...@@ -443,7 +443,7 @@ usb_0: usb@8af8800 {
resets = <&gcc GCC_USB0_BCR>; resets = <&gcc GCC_USB0_BCR>;
status = "disabled"; status = "disabled";
dwc_0: usb@8a00000 { dwc_0: dwc3@8a00000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x8a00000 0xcd00>; reg = <0x8a00000 0xcd00>;
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
...@@ -484,7 +484,7 @@ usb_1: usb@8cf8800 { ...@@ -484,7 +484,7 @@ usb_1: usb@8cf8800 {
resets = <&gcc GCC_USB1_BCR>; resets = <&gcc GCC_USB1_BCR>;
status = "disabled"; status = "disabled";
dwc_1: usb@8c00000 { dwc_1: dwc3@8c00000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x8c00000 0xcd00>; reg = <0x8c00000 0xcd00>;
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -2566,7 +2566,7 @@ usb3: usb@6af8800 { ...@@ -2566,7 +2566,7 @@ usb3: usb@6af8800 {
power-domains = <&gcc USB30_GDSC>; power-domains = <&gcc USB30_GDSC>;
status = "disabled"; status = "disabled";
usb@6a00000 { dwc3@6a00000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x06a00000 0xcc00>; reg = <0x06a00000 0xcc00>;
interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
...@@ -2873,7 +2873,7 @@ usb2: usb@76f8800 { ...@@ -2873,7 +2873,7 @@ usb2: usb@76f8800 {
qcom,select-utmi-as-pipe-clk; qcom,select-utmi-as-pipe-clk;
status = "disabled"; status = "disabled";
usb@7600000 { dwc3@7600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x07600000 0xcc00>; reg = <0x07600000 0xcc00>;
interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -1964,7 +1964,7 @@ usb3: usb@a8f8800 { ...@@ -1964,7 +1964,7 @@ usb3: usb@a8f8800 {
resets = <&gcc GCC_USB_30_BCR>; resets = <&gcc GCC_USB_30_BCR>;
usb3_dwc3: usb@a800000 { usb3_dwc3: dwc3@a800000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x0a800000 0xcd00>; reg = <0x0a800000 0xcd00>;
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -337,7 +337,7 @@ &usb2_phy_sec { ...@@ -337,7 +337,7 @@ &usb2_phy_sec {
&usb3 { &usb3 {
status = "okay"; status = "okay";
usb@7580000 { dwc3@7580000 {
dr_mode = "host"; dr_mode = "host";
}; };
}; };
......
...@@ -544,7 +544,7 @@ usb3: usb@7678800 { ...@@ -544,7 +544,7 @@ usb3: usb@7678800 {
assigned-clock-rates = <19200000>, <200000000>; assigned-clock-rates = <19200000>, <200000000>;
status = "disabled"; status = "disabled";
usb@7580000 { dwc3@7580000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x07580000 0xcd00>; reg = <0x07580000 0xcd00>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
...@@ -573,7 +573,7 @@ usb2: usb@79b8800 { ...@@ -573,7 +573,7 @@ usb2: usb@79b8800 {
assigned-clock-rates = <19200000>, <133333333>; assigned-clock-rates = <19200000>, <133333333>;
status = "disabled"; status = "disabled";
usb@78c0000 { dwc3@78c0000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x078c0000 0xcc00>; reg = <0x078c0000 0xcc00>;
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -2756,7 +2756,7 @@ usb_1: usb@a6f8800 { ...@@ -2756,7 +2756,7 @@ usb_1: usb@a6f8800 {
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>; <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
interconnect-names = "usb-ddr", "apps-usb"; interconnect-names = "usb-ddr", "apps-usb";
usb_1_dwc3: usb@a600000 { usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xe000>; reg = <0 0x0a600000 0 0xe000>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -3781,7 +3781,7 @@ usb_1: usb@a6f8800 { ...@@ -3781,7 +3781,7 @@ usb_1: usb@a6f8800 {
<&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>; <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
interconnect-names = "usb-ddr", "apps-usb"; interconnect-names = "usb-ddr", "apps-usb";
usb_1_dwc3: usb@a600000 { usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xcd00>; reg = <0 0x0a600000 0 0xcd00>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
...@@ -3829,7 +3829,7 @@ usb_2: usb@a8f8800 { ...@@ -3829,7 +3829,7 @@ usb_2: usb@a8f8800 {
<&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>; <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
interconnect-names = "usb-ddr", "apps-usb"; interconnect-names = "usb-ddr", "apps-usb";
usb_2_dwc3: usb@a800000 { usb_2_dwc3: dwc3@a800000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a800000 0 0xcd00>; reg = <0 0x0a800000 0 0xcd00>;
interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
......
...@@ -2344,7 +2344,7 @@ usb_1: usb@a6f8800 { ...@@ -2344,7 +2344,7 @@ usb_1: usb@a6f8800 {
resets = <&gcc GCC_USB30_PRIM_BCR>; resets = <&gcc GCC_USB30_PRIM_BCR>;
usb_1_dwc3: usb@a600000 { usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xcd00>; reg = <0 0x0a600000 0 0xcd00>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment