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

Commit 442f4aeb 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 MPP and GPIO config for msm8939 CDP/MTP"

parents 2094f746 deb02b60

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

+52 −0
Original line number Diff line number Diff line
@@ -329,3 +329,55 @@ 
	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

	qcom,platform-bklight-en-gpio = <&msm_gpio 98 0>;

};



&pm8916_mpps {

	mpp@a000 { /* MPP 1 */

		/* VDD_PX */

		status = "disabled";

	};



	mpp@a100 { /* MPP 2 */

		/* HR LED */

		status = "disabled";

	};



	mpp@a200 { /* MPP 3 */

		/* VREF DAC */

		status = "disabled";

	};



	mpp@a300 { /* MPP 4 */

		/* Backlight PWM */

		qcom,mode = <1>;		/* Digital output */

		qcom,invert = <1>;		/* Enable invert */

		qcom,src-sel = <0>;		/* FUNC GPIO */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,master-en = <1>;		/* Enable MPP */

	};

};



&pm8916_gpios {

	gpio@c000 { /* GPIO 1 */

		/* Battery UICC Alarm */

		status = "disabled";

	};



	gpio@c100 { /* GPIO 2 */

		/* NFC_CLK_REQ */

		qcom,mode = <0>; /* QPNP_PIN_MODE_DIG_IN */

		qcom,pull = <5>; /* QPNP_PIN_PULL_NO */

		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */

		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */

		qcom,master-en = <1>;

	};



	gpio@c200 { /* GPIO 3 */

		/* External regulator control for WTR */

		status = "disabled";

	};



	gpio@c300 { /* GPIO 4 */

		/* External regulator control for APC */

		status = "disabled";

	};

};

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

+52 −0
Original line number Diff line number Diff line
@@ -327,3 +327,55 @@ 
	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

	qcom,platform-bklight-en-gpio = <&msm_gpio 98 0>;

};



&pm8916_mpps {

	mpp@a000 { /* MPP 1 */

		/* VDD_PX */

		status = "disabled";

	};



	mpp@a100 { /* MPP 2 */

		/* HR LED */

		status = "disabled";

	};



	mpp@a200 { /* MPP 3 */

		/* VREF DAC */

		status = "disabled";

	};



	mpp@a300 { /* MPP 4 */

		/* Backlight PWM */

		qcom,mode = <1>;		/* Digital output */

		qcom,invert = <1>;		/* Enable invert */

		qcom,src-sel = <0>;		/* FUNC GPIO */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,master-en = <1>;		/* Enable MPP */

	};

};



&pm8916_gpios {

	gpio@c000 { /* GPIO 1 */

		/* Battery UICC Alarm */

		status = "disabled";

	};



	gpio@c100 { /* GPIO 2 */

		/* NFC_CLK_REQ */

		qcom,mode = <0>; /* QPNP_PIN_MODE_DIG_IN */

		qcom,pull = <5>; /* QPNP_PIN_PULL_NO */

		qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */

		qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */

		qcom,master-en = <1>;

	};



	gpio@c200 { /* GPIO 3 */

		/* External regulator control for WTR */

		status = "disabled";

	};



	gpio@c300 { /* GPIO 4 */

		/* External regulator control for APC */

		status = "disabled";

	};

};