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

Commit d7a662d0 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: Add pin setup for modem-QSPI mux on 8996"

parents e5627c64 1192bb20

arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,20 @@ 
		interrupt-controller;

		#interrupt-cells = <2>;



		/* pin governing mux between QSPI and modem on auto boards */

		modem_mux: mdm_mux {

			mux {

				pins = "gpio121";

				function = "gpio";

			};



			config {

				pins = "gpio121";

				drive-strength = <2>;

				bias-pull-up;

				output-high;

			};

		};

		/* add pingrp for adv7533 */

		pmx_adv7533: pmx_adv7533 {

			adv7533_0_int_active: adv7533_0_int_active {

arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
	qcom,board-id = <0x03010001 0>;

};



&pil_modem {

	pinctrl-names = "default";

	pinctrl-0 = <&modem_mux>;

};



&spi_9 {

	status = "ok";

	can-controller@0 {

arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ 
	};

};



&pil_modem {

	pinctrl-names = "default";

	pinctrl-0 = <&modem_mux>;

};



&slim_msm {

	status = "disabled";

};

arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ 
	};

};



&pil_modem {

	pinctrl-names = "default";

	pinctrl-0 = <&modem_mux>;

};



&gfx_vreg {

	qcom,cpr-voltage-ceiling =

		/* Speed bin 0 */