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

Commit 1c24ab74 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove extcon and PHY nodes on atoll RUMI"

parents 7b1d5892 568641fb

arch/arm64/boot/dts/qcom/atoll-idp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,14 @@ 
	};

};



&usb0 {

	extcon = <&pm6150_pdphy>, <&pm6150_charger>;

};



&usb_qmp_dp_phy {

	extcon = <&pm6150_pdphy>;

};



&spmi_bus {

	qcom,pm6150l@4 {

		pm6150l_adc_tm_iio: adc_tm@3400 {

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

+15 −0
Original line number Diff line number Diff line
@@ -139,4 +139,19 @@ 
		usb-phy = <&usb_emu_phy>, <&usb_nop_phy>;

		maximum-speed = "high-speed";

	};

	qcom,usbbam@a704000 {

		status = "disabled";

	};

};



&qusb_phy0 {

	status = "disabled";

};



&usb_qmp_dp_phy {

	status = "disabled";

};



&pm6150_pdphy {

	status = "disabled";

};

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

+0 −8
Original line number Diff line number Diff line
@@ -2446,14 +2446,6 @@ 
#include "atoll-usb.dtsi"

#include "atoll-vidc.dtsi"



&usb0 {

	extcon = <&pm6150_pdphy>, <&pm6150_charger>;

};



&usb_qmp_dp_phy {

	extcon = <&pm6150_pdphy>;

};



&pm6150_vadc {

	pinctrl-names = "default";

	pinctrl-0 = <&nvm_therm_default &sdm_skin_therm_default>;