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

Commit d65eec49 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: configure PMI8937 gpio2 to bring sleep clock out"

parents 99cf2c15 617a7663

arch/arm/boot/dts/qcom/apq8017-rome.dtsi

+13 −1
Original line number Diff line number Diff line 
/*

 * copyright (c) 2016, The Linux Foundation. All rights reserved.

 * copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -19,3 +19,15 @@ 
		qcom,cap-tsf-gpio = <&tlmm 126 1>;

	};

};



&pm8937_gpios {

	gpio@c100 { /* GPIO 2 - Rome Sleep Clock */

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

		qcom,vin-sel = <3>;		/* VIN 3 */

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

		qcom,out-strength = <2>;	/* Medium */

		qcom,pull = <4>;

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

		status = "okay";

	};

};

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

+0 −8
Original line number Diff line number Diff line
@@ -264,14 +264,6 @@ 
	status = "ok";

};



&pm8937_gpios {

	gpio@c100 {

		qcom,mode = <0>;

		qcom,vin-sel = <3>;

		status = "okay";

	};

};



/* SX1509q i/o expander */

&i2c_2 {

	status = "ok";