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

Commit 1f8241d1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Move 8994 Interposer BLSP definitions"

parents 10f70b40 5b118e36

arch/arm/boot/dts/qcom/msm8994-cdp-interposer.dts

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
	model = "Qualcomm Technologies, Inc. MSM 8974Pro-AC MSM8994 Interposer CDP";

	compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,cdp";

	qcom,board-id = <1 3>;



	aliases {

		serial0 = &blsp1_uart1;

	};

};



&blsp1_uart1 {

	status = "ok";

};



&usb_otg {

arch/arm/boot/dts/qcom/msm8994-cdp.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -10,16 +10,6 @@ 
 * GNU General Public License for more details.

 */



/ {

	aliases {

		serial0 = &blsp1_uart1;

	};

};



&blsp1_uart1{

	status = "ok";

};



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;

arch/arm/boot/dts/qcom/msm8994-mtp-interposer.dts

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
	compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,mtp";

	qcom,board-id = <8 3>;



	aliases {

		serial0 = &blsp1_uart1;

	};



	qcom,mss@fc880000 {

		status = "disabled";

	};
@@ -30,6 +34,10 @@ 
	};

};



&blsp1_uart1 {

	status = "ok";

};



&usb_otg {

	qcom,dp-manual-pullup;

	qcom,hsusb-otg-otg-control = <2>;

arch/arm/boot/dts/qcom/msm8994-mtp.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -10,16 +10,6 @@ 
 * GNU General Public License for more details.

 */



/ {

	aliases {

		serial0 = &blsp1_uart1;

	};

};



&blsp1_uart1{

	status = "ok";

};



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;