Merge "ARM: dts: msm: configure PMIC GPIOs and MPPs for msmzirc" (2723473b) · Commits · e / devices / android_kernel_sony_msm8994

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

+45 −0

+45 −0

Original line number	Diff line number	Diff line
		@@ -49,3 +49,48 @@
		regulator-name = "smb1357_otg_supply";
		};
		};

		&pmd9635_gpios {
		gpio@c000 { /* GPIO 1 */
		};

		gpio@c100 { /* GPIO 2 */
		};

		gpio@c200 { /* GPIO 3 */
		};

		gpio@c300 { /* GPIO 4 */
		status = "ok";
		qcom,mode = <0>; /* Digital input */
		qcom,pull = <1>; /* Pull up 1.5 uA */
		qcom,vin-sel = <2>; /* PMD9635 LDO 6 = 1.8 V */
		qcom,master-en = <1>; /* Enable GPIO */
		};

		gpio@c400 { /* GPIO 5 */
		};

		gpio@c500 { /* GPIO 6 */
		};
		};

		&pmd9635_mpps {
		mpp@a000 { /* MPP 1 */
		};

		mpp@a100 { /* MPP 2 */
		};

		mpp@a200 { /* MPP 3 */
		};

		mpp@a300 { /* MPP 4 */
		};

		mpp@a400 { /* MPP 5 */
		};

		mpp@a500 { /* MPP 6 */
		};
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -787,4 +787,5 @@
		};

		#include "msm-pmd9635-rpm-regulator.dtsi"
		#include "msm-pmd9635.dtsi"
		#include "msmzirc-regulator.dtsi"