arm64: dts: qcom: sm6115: Cleanup USB node's label

There is only one USB controller present on SM6115 / SM4250
Qualcomm SoC, so drop the numbering used with USB node's label
names in the dtsi and the related sm4250-oneplus-billie2.dts.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230314083633.1882214-2-bhupesh.sharma@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
index a3f1c7c41fd73d9cc8d05b47035da00e49133215..fa57f4bf58256b465d89db93f821affebef0bcc3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
+++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
@@ -225,11 +225,11 @@
        status = "okay";
 };
 
-&usb_1 {
+&usb {
        status = "okay";
 };
 
-&usb_1_hsphy {
+&usb_hsphy {
        vdd-supply = <&vreg_l4a>;
        vdda-pll-supply = <&vreg_l12a>;
        vdda-phy-dpdm-supply = <&vreg_l15a>;

diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index a9d2ff40935f08485a079e2cf53c41889383e4fc..86d26a782654b0f0432943bc0a208bd904cd85ea 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -650,7 +650,7 @@
                        #power-domain-cells = <1>;
                };
 
-               usb_1_hsphy: phy@1613000 {
+               usb_hsphy: phy@1613000 {
                        compatible = "qcom,sm6115-qusb2-phy";
                        reg = <0x0 0x01613000 0x0 0x180>;
                        #phy-cells = <0>;
@@ -1089,7 +1089,7 @@
                        };
                };
 
-               usb_1: usb@4ef8800 {
+               usb: usb@4ef8800 {
                        compatible = "qcom,sm6115-dwc3", "qcom,dwc3";
                        reg = <0x0 0x04ef8800 0x0 0x400>;
                        #address-cells = <2>;
@@ -1117,11 +1117,11 @@
                        qcom,select-utmi-as-pipe-clk;
                        status = "disabled";
 
-                       usb_1_dwc3: usb@4e00000 {
+                       usb_dwc3: usb@4e00000 {
                                compatible = "snps,dwc3";
                                reg = <0x0 0x04e00000 0x0 0xcd00>;
                                interrupts = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
-                               phys = <&usb_1_hsphy>;
+                               phys = <&usb_hsphy>;
                                phy-names = "usb2-phy";
                                iommus = <&apps_smmu 0x120 0x0>;
                                snps,dis_u2_susphy_quirk;

diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 00b153aa1b7d0a390ccc1631d96a15c15641d289..20a51e164d2a9450f0424397c27a41da45a3f946 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -273,11 +273,11 @@
        status = "okay";
 };
 
-&usb_1 {
+&usb {
        status = "okay";
 };
 
-&usb_1_hsphy {
+&usb_hsphy {
        vdd-supply = <&pm6125_l4>;
        vdda-pll-supply = <&pm6125_l12>;
        vdda-phy-dpdm-supply = <&pm6125_l15>;