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

Commit a2a026ed 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: change hard reset behavior for PMI8994 and PMK8001 PON"

parents abc93b0d e31cae10

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

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

 */



#include <dt-bindings/msm/power-on.h>



&spmi_bus {

	#address-cells = <1>;

	#size-cells = <0>;
@@ -31,6 +33,8 @@ 
			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			qcom,secondary-pon-reset;

			qcom,hard-reset-poweroff-type =

				<PON_POWER_OFF_SHUTDOWN>;

			pon_perph_reg: qcom,pon_perph_reg {

				regulator-name = "pon_spare_reg";

				qcom,pon-spare-reg-addr = <0x8c>;

arch/arm/boot/dts/qcom/msm-pmk8001.dtsi

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

 */



#include <dt-bindings/msm/power-on.h>



&spmi_bus {

	qcom,pmk8001@6 {

		spmi-slave-container;
@@ -26,6 +28,8 @@ 
			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			qcom,secondary-pon-reset;

			qcom,hard-reset-poweroff-type =

				<PON_POWER_OFF_SHUTDOWN>;

		};



		pmk8001_gpios: gpios {