Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69687521 authored by Jack Pham's avatar Jack Pham
Browse files

ARM: dts: msm: Move SDM845 RUMI USB overrides to the include file 



Move the RUMI-specific overrides for the USB nodes from the .dts
file to the .dtsi file. This allows sdm845-v2-rumi.dts to inherit
the same settings. Also remove the include for sdm845-usb.dtsi as
it now is part of the base SoC sdm845.dtsi.

Change-Id: I345b46317f0f060773b5e9589f2a84b493a55dd2
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent f2b61c4d

arch/arm64/boot/dts/qcom/sdm845-rumi.dts

+0 −30
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "sdm845.dtsi"

#include "sdm845-rumi.dtsi"

#include "sdm845-usb.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. SDM845 RUMI";

	compatible = "qcom,sdm845-rumi", "qcom,sdm845", "qcom,rumi";
@@ -28,32 +27,3 @@ 
		status = "disabled";

	};

};
 


&usb0 {

	/delete-property/ qcom,usb-dbm;

	qcom,charging-disabled;

	dwc3@a600000 {

		maximum-speed = "high-speed";

	};

};



&qusb_phy0 {

	reg = <0x088e2000 0x4>,

	      <0x0a720000 0x9500>;

	reg-names = "qusb_phy_base",

		"emu_phy_base";

	qcom,emulation;

	qcom,emu-init-seq = <0x19 0x1404

			     0x20 0x1414

			     0x79 0x1410

			     0x00 0x1418

			     0x99 0x1404

			     0x04 0x1408

			     0xd9 0x1404>;



	qcom,emu-dcm-reset-seq = <0x5 0x14	/* 0x1 0x14 for E1.2 */

				  0x100000 0x20

				  0x0 0x20

				  0x1a0 0x20	/* 0x220 0x20 for E1.2 */

				  0x80 0x28>;

};

arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -151,3 +151,33 @@ 
&pmi8998_charger {

	qcom,suspend-input;

};



&usb0 {

	/delete-property/ qcom,usb-dbm;

	extcon = <0>, <0>, <&eud>;

	qcom,charging-disabled;

	dwc3@a600000 {

		maximum-speed = "high-speed";

	};

};



&qusb_phy0 {

	reg = <0x088e2000 0x4>,

	      <0x0a720000 0x9500>;

	reg-names = "qusb_phy_base",

		"emu_phy_base";

	qcom,emulation;

	qcom,emu-init-seq = <0x19 0x1404

			     0x20 0x1414

			     0x79 0x1410

			     0x00 0x1418

			     0x99 0x1404

			     0x04 0x1408

			     0xd9 0x1404>;



	qcom,emu-dcm-reset-seq = <0x5 0x14	/* 0x1 0x14 for E1.2 */

				  0x100000 0x20

				  0x0 0x20

				  0x1a0 0x20	/* 0x220 0x20 for E1.2 */

				  0x80 0x28>;

};