Commit 0ea0edc0 authored by Bhupesh Sharma's avatar Bhupesh Sharma Committed by Bjorn Andersson
Browse files

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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBhupesh Sharma <bhupesh.sharma@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230314083633.1882214-2-bhupesh.sharma@linaro.org
parent cf386126

arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts

+2 −2
Original line number Diff line number Diff line
@@ -225,11 +225,11 @@ &ufs_mem_phy { 
	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>;

arch/arm64/boot/dts/qcom/sm6115.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ gcc: clock-controller@1400000 { 
			#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 @@ spi5: spi@4a94000 { 
			};

		};



		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 @@ usb_1: usb@4ef8800 { 
			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;

arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts

+2 −2
Original line number Diff line number Diff line
@@ -273,11 +273,11 @@ &ufs_mem_phy { 
	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>;