Merge "ARM: dts: msm: Move SDM845 RUMI USB overrides to the include file" into msm-4.9 (c6b27ec1) · Commits · e / devices / android_kernel_fairphone_FP3

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>;
		};

+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>;
		};