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

Commit 9553ae8d 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: Support boards with PMK8001 PMIC for msm8996"

parents e443d0f7 e016d031

arch/arm/boot/dts/qcom/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -10,12 +10,20 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-sim.dtb \ 
	msm8996-v1-pmi8994-pm8004-mtp.dtb \

	msm8996-v2-pmi8994-cdp.dtb \

	msm8996-v2-pmi8994-mtp.dtb \

	msm8996-v2-pmi8994-pmk8001-cdp.dtb \

	msm8996-v2-pmi8994-pmk8001-mtp.dtb \

	msm8996-v2-pmi8994-pm8004-cdp.dtb \

	msm8996-v2-pmi8994-pm8004-mtp.dtb \

	msm8996-v2-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v2-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v3-pmi8994-cdp.dtb \

	msm8996-v3-pmi8994-mtp.dtb \

	msm8996-v3-pmi8994-pmk8001-cdp.dtb \

	msm8996-v3-pmi8994-pmk8001-mtp.dtb \

	msm8996-v3-pmi8994-pm8004-cdp.dtb \

	msm8996-v3-pmi8994-pm8004-mtp.dtb \

	msm8996-v3-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v3-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v1-liquid.dtb \

	msm8996-v2-fluid.dtb \

	msm8996-v3-fluid.dtb \
@@ -23,8 +31,12 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-sim.dtb \ 
	msm8996-v3-liquid.dtb \

	msm8996-v2.0-pmi8994-cdp.dtb \

	msm8996-v2.0-pmi8994-mtp.dtb \

	msm8996-v2.0-pmi8994-pmk8001-cdp.dtb \

	msm8996-v2.0-pmi8994-pmk8001-mtp.dtb \

	msm8996-v2.0-pmi8994-pm8004-cdp.dtb \

	msm8996-v2.0-pmi8994-pm8004-mtp.dtb \

	msm8996-v2.0-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v2.0-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v2.0-fluid.dtb \

	msm8996-v2.0-liquid.dtb \

	apq8096-v2-liquid.dtb \

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -338,7 +338,7 @@ 
			reg = <0x2800 0x100>;

		};



		qcom,pm8994_rtc {

		pm8994_rtc: qcom,pm8994_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

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

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&spmi_bus {

	qcom,pmk8001@6 {

		spmi-slave-container;

		reg = <0x6>;

		#address-cells = <1>;

		#size-cells = <1>;



		pmk8001_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";

			reg = <0x100 0x100>;

		};



		qcom,power-on@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			qcom,secondary-pon-reset;

			status = "disabled";

		};



		pmk8001_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmk8001-gpio";



			gpio@c000 {

				reg = <0xc000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			gpio@c100 {

				reg = <0xc100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			gpio@c200 {

				reg = <0xc200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			gpio@c300 {

				reg = <0xc300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};

		};



		qcom,pmk8001_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;

			qcom,qpnp-rtc-write = <0>;

			qcom,qpnp-rtc-alarm-pwrup = <0>;



			qcom,pmk8001_rtc_rw@6000 {

				reg = <0x6000 0x100>;

			};

			qcom,pmk8001_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x6 0x61 0x1>;

			};

		};

	};



	qcom,pmk8001@7 {

		spmi-slave-container;

		reg = <0x7>;

		#address-cells = <1>;

		#size-cells = <1>;

	};

};

arch/arm/boot/dts/qcom/msm8996-pm8994-pm8004-pmk8001.dtsi

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/*

 * As a general rule, only chipset-specific property overrides should be placed

 * inside this file.

 */



#include "msm8996-pm8994-pm8004.dtsi"

#include "msm-pmk8001.dtsi"



/ {

	qcom,pmic-id = <0x20009 0x1000C 0x10012 0x0>;

};



/*

 * Override PM8994 resources with proper PMK8001 resources for MSM8996 with

 * PMK8001.

 */

&pm8994_rtc {

	status = "disabled";

};

arch/arm/boot/dts/qcom/msm8996-pm8994-pmi8994-pm8004-pmk8001.dtsi

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/*

 * As a general rule, only chipset-specific property overrides should be placed

 * inside this file.

 */



#include "msm8996-pm8994-pmi8994-pm8004.dtsi"

#include "msm-pmk8001.dtsi"



/ {

	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x10012>;

};



/*

 * Override PM8994 resources with proper PMK8001 resources for MSM8996 with

 * PMK8001.

 */

&pm8994_rtc {

	status = "disabled";

};