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

Commit 8d232f1c 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: Make PMIC devices upstream spmi compatible"

parents 280410c2 c971c3dd

arch/arm64/boot/dts/qcom/pm8937.dtsi

+34 −108
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, 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
@@ -14,8 +14,8 @@ 
&spmi_bus {



	qcom,pm8937@0 {

		spmi-slave-container;

		reg = <0x0>;

		compatible ="qcom,spmi-pmic";

		reg = <0x0 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -27,10 +27,10 @@ 
		qcom,power-on@800 {

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

			reg = <0x800 0x100>;

			interrupts = <0x0 0x8 0x0>,

				<0x0 0x8 0x1>,

				<0x0 0x8 0x4>,

				<0x0 0x8 0x5>;

			interrupts = <0x0 0x8 0x0 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x1 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x4 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x5 IRQ_TYPE_NONE>;

			interrupt-names = "kpdpwr", "resin",

				"resin-bark", "kpdpwr-resin-bark";

			qcom,pon-dbc-delay = <15625>;
@@ -52,7 +52,7 @@ 
		pm8937_temp_alarm: qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			label = "pm8937_tz";

			qcom,channel-num = <8>;

			qcom,threshold-set = <0>;
@@ -65,7 +65,6 @@ 
		};



		pm8937_rtc: qcom,pm8937_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -78,110 +77,37 @@ 


			qcom,pm8937_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x0 0x61 0x1>;

				interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

			};

		};



		pm8937_mpps: mpps {

			compatible = "qcom,qpnp-pin";

			spmi-dev-container;

			compatible = "qcom,spmi-mpp";

			reg = <0xa000 0x400>;

			interrupts = <0x0 0xa0 0 IRQ_TYPE_NONE>,

				     <0x0 0xa1 0 IRQ_TYPE_NONE>,

				     <0x0 0xa2 0 IRQ_TYPE_NONE>,

				     <0x0 0xa3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8937_mpp1", "pm8937_mpp2",

					  "pm8937_mpp3", "pm8937_mpp4";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm8937-mpp";



			mpp@a000 {

				reg = <0xa000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			mpp@a100 {

				/* MPP2 - PA_THERM config */

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				qcom,mode = <4>; /* AIN input */

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

				qcom,ain-route = <1>; /* AMUX 6 */

				qcom,master-en = <1>;

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

			};



			mpp@a200 {

				reg = <0xa200 0x100>;

				qcom,pin-num = <3>;

				status = "disabled";

			};



			mpp@a300 {

				/* MPP4 - CASE_THERM config */

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				qcom,mode = <4>; /* AIN input */

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

				qcom,ain-route = <3>; /* AMUX 8 */

				qcom,master-en = <1>;

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

			};

		};



		pm8937_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x800>;

			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

				     <0x0 0xc1 0 IRQ_TYPE_NONE>,

				     <0x0 0xc4 0 IRQ_TYPE_NONE>,

				     <0x0 0xc6 0 IRQ_TYPE_NONE>,

				     <0x0 0xc7 0 IRQ_TYPE_NONE>;

			interrupt-names = "pm8937_gpio1", "pm8937_gpio2",

					  "pm8937_gpio5", "pmi8937_gpio7",

					  "pm8937_gpio8";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pm8937-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";

			};



			gpio@c400 {

				reg = <0xc400 0x100>;

				qcom,pin-num = <5>;

				status = "disabled";

			};



			gpio@c500 {

				reg = <0xc500 0x100>;

				qcom,pin-num = <6>;

				status = "disabled";

			};



			gpio@c600 {

				reg = <0xc600 0x100>;

				qcom,pin-num = <7>;

				status = "disabled";

			};



			gpio@c700 {

				reg = <0xc700 0x100>;

				qcom,pin-num = <8>;

				status = "disabled";

			};

			qcom,gpios-disallowed = <3 4 6>;

		};



		pm8937_vadc: vadc@3100 {
@@ -189,7 +115,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

			interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;
@@ -326,9 +252,9 @@ 
			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

					<0x0 0x34 0x4>;

			interrupts =	<0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x34 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x34 0x4 IRQ_TYPE_EDGE_RISING>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";
@@ -365,8 +291,8 @@ 
	};



	pm8937_1: qcom,pm8937@1 {

		spmi-slave-container;

		reg = <0x1>;

		compatible = "qcom,spmi-pmic";

		reg = <0x1 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm64/boot/dts/qcom/pmi8937.dtsi

+68 −84
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, 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
@@ -16,8 +16,8 @@ 
&spmi_bus {



	qcom,pmi8937@2 {

		spmi-slave-container;

		reg = <0x2>;

		compatible ="qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -45,7 +45,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x2 0x31 0x0>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;
@@ -141,35 +141,19 @@ 
		};



		pmi8937_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			compatible = "qcom,spmi-mpp";

			reg = <0xa000 0x400>;

			interrupts = <0x2 0xa0 0 IRQ_TYPE_NONE>,

				     <0x2 0xa1 0 IRQ_TYPE_NONE>,

				     <0x2 0xa2 0 IRQ_TYPE_NONE>,

				     <0x2 0xa3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi8937_mpp1", "pmi8937_mpp2",

					  "pmi8937_mpp3", "pmi8937_mpp4";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmi8937-mpp";



			mpp@a000 {

				reg = <0xa000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			mpp@a100 {

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			mpp@a300 {

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};

		};



		pmi8937_charger: qcom,qpnp-smbcharger {

			spmi-dev-container;

			compatible = "qcom,qpnp-smbcharger";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -191,14 +175,14 @@ 


			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x2 0x10 0x0>,

						<0x2 0x10 0x1>,

						<0x2 0x10 0x2>,

						<0x2 0x10 0x3>,

						<0x2 0x10 0x4>,

						<0x2 0x10 0x5>,

						<0x2 0x10 0x6>,

						<0x2 0x10 0x7>;

				interrupts =	<0x2 0x10 0x0 IRQ_TYPE_NONE>,

						<0x2 0x10 0x1 IRQ_TYPE_NONE>,

						<0x2 0x10 0x2 IRQ_TYPE_NONE>,

						<0x2 0x10 0x3 IRQ_TYPE_NONE>,

						<0x2 0x10 0x4 IRQ_TYPE_NONE>,

						<0x2 0x10 0x5 IRQ_TYPE_NONE>,

						<0x2 0x10 0x6 IRQ_TYPE_NONE>,

						<0x2 0x10 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"chg-error",

							"chg-inhibit",
@@ -212,9 +196,9 @@ 


			qcom,otg@1100 {

				reg = <0x1100 0x100>;

				interrupts =	<0x2 0x11 0x0>,

						<0x2 0x11 0x1>,

						<0x2 0x11 0x3>;

				interrupts =	<0x2 0x11 0x0 IRQ_TYPE_NONE>,

						<0x2 0x11 0x1 IRQ_TYPE_NONE>,

						<0x2 0x11 0x3 IRQ_TYPE_NONE>;

				interrupt-names =	"otg-fail",

							"otg-oc",

						"usbid-change";
@@ -222,14 +206,14 @@ 


			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts =	<0x2 0x12 0x0>,

						<0x2 0x12 0x1>,

						<0x2 0x12 0x2>,

						<0x2 0x12 0x3>,

					<0x2 0x12 0x4>,

						<0x2 0x12 0x5>,

						<0x2 0x12 0x6>,

						<0x2 0x12 0x7>;

				interrupts =	<0x2 0x12 0x0 IRQ_TYPE_NONE>,

						<0x2 0x12 0x1 IRQ_TYPE_NONE>,

						<0x2 0x12 0x2 IRQ_TYPE_NONE>,

						<0x2 0x12 0x3 IRQ_TYPE_NONE>,

						<0x2 0x12 0x4 IRQ_TYPE_NONE>,

						<0x2 0x12 0x5 IRQ_TYPE_NONE>,

						<0x2 0x12 0x6 IRQ_TYPE_NONE>,

						<0x2 0x12 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"batt-hot",

							"batt-warm",
@@ -243,10 +227,10 @@ 


			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =	<0x2 0x13 0x0>,

						<0x2 0x13 0x1>,

					<0x2 0x13 0x2>,

						<0x2 0x13 0x5>;

				interrupts =	<0x2 0x13 0x0 IRQ_TYPE_NONE>,

						<0x2 0x13 0x1 IRQ_TYPE_NONE>,

						<0x2 0x13 0x2 IRQ_TYPE_NONE>,

						<0x2 0x13 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"usbin-uv",

						"usbin-ov",
@@ -256,20 +240,20 @@ 


			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

				interrupts =	<0x2 0x14 0x0>,

						<0x2 0x14 0x1>;

				interrupts =	<0x2 0x14 0x0 IRQ_TYPE_NONE>,

						<0x2 0x14 0x1 IRQ_TYPE_NONE>;

				interrupt-names =	"dcin-uv",

							"dcin-ov";

			};



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts =	<0x2 0x16 0x0>,

						<0x2 0x16 0x1>,

						<0x2 0x16 0x2>,

					<0x2 0x16 0x3>,

						<0x2 0x16 0x4>,

						<0x2 0x16 0x5>;

				interrupts =	<0x2 0x16 0x0 IRQ_TYPE_NONE>,

						<0x2 0x16 0x1 IRQ_TYPE_NONE>,

						<0x2 0x16 0x2 IRQ_TYPE_NONE>,

						<0x2 0x16 0x3 IRQ_TYPE_NONE>,

						<0x2 0x16 0x4 IRQ_TYPE_NONE>,

						<0x2 0x16 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"power-ok",

							"temp-shutdown",
@@ -285,7 +269,6 @@ 
		};



		pmi8937_fg: qcom,fg {

			spmi-dev-container;

			compatible = "qcom,qpnp-fg";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -303,13 +286,13 @@ 
			qcom,fg-soc@4000 {

			status = "okay";

				reg = <0x4000 0x100>;

				interrupts =	<0x2 0x40 0x0>,

						<0x2 0x40 0x1>,

						<0x2 0x40 0x2>,

						<0x2 0x40 0x3>,

						<0x2 0x40 0x4>,

						<0x2 0x40 0x5>,

						<0x2 0x40 0x6>;

				interrupts =	<0x2 0x40 0x0 IRQ_TYPE_NONE>,

						<0x2 0x40 0x1 IRQ_TYPE_NONE>,

						<0x2 0x40 0x2 IRQ_TYPE_NONE>,

						<0x2 0x40 0x3 IRQ_TYPE_NONE>,

						<0x2 0x40 0x4 IRQ_TYPE_NONE>,

						<0x2 0x40 0x5 IRQ_TYPE_NONE>,

						<0x2 0x40 0x6 IRQ_TYPE_NONE>;



				interrupt-names =	"high-soc",

							"low-soc",
@@ -322,14 +305,14 @@ 


			qcom,fg-batt@4100 {

				reg = <0x4100 0x100>;

				interrupts =	<0x2 0x41 0x0>,

						<0x2 0x41 0x1>,

					<0x2 0x41 0x2>,

						<0x2 0x41 0x3>,

						<0x2 0x41 0x4>,

						<0x2 0x41 0x5>,

						<0x2 0x41 0x6>,

						<0x2 0x41 0x7>;

				interrupts =	<0x2 0x41 0x0 IRQ_TYPE_NONE>,

						<0x2 0x41 0x1 IRQ_TYPE_NONE>,

						<0x2 0x41 0x2 IRQ_TYPE_NONE>,

						<0x2 0x41 0x3 IRQ_TYPE_NONE>,

						<0x2 0x41 0x4 IRQ_TYPE_NONE>,

						<0x2 0x41 0x5 IRQ_TYPE_NONE>,

						<0x2 0x41 0x6 IRQ_TYPE_NONE>,

						<0x2 0x41 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"soft-cold",

							"soft-hot",
@@ -348,8 +331,8 @@ 
			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

				interrupts =	<0x2 0x44 0x0>,

						<0x2 0x44 0x2>;

				interrupts =	<0x2 0x44 0x0 IRQ_TYPE_NONE>,

						<0x2 0x44 0x2 IRQ_TYPE_NONE>;



				interrupt-names =	"mem-avail",

							"data-rcvry-sug";
@@ -360,8 +343,8 @@ 
			compatible = "qcom,msm-bcl";

			reg = <0x4200 0xff>;

			reg-names = "fg_user_adc";

			interrupts = <0x2 0x42 0x0>,

					<0x2 0x42 0x1>;

			interrupts = <0x2 0x42 0x0 IRQ_TYPE_NONE>,

				     <0x2 0x42 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-high-ibat-int",

					"bcl-low-vbat-int";

			qcom,vbat-scaling-factor = <39000>;
@@ -384,8 +367,8 @@ 
	};



	qcom,pmi8937@3 {

		spmi-slave-container;

		reg = <0x3>;

		compatible ="qcom,spmi-pmic";

		reg = <0x3 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -405,7 +388,7 @@ 
				<0xd900 0x100>;

			reg-names = "qpnp-wled-ctrl-base",

					"qpnp-wled-sink-base";

			interrupts = <0x3 0xd8 0x2>;

			interrupts = <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "sc-irq";

			status = "okay";

			linux,name = "wled";
@@ -424,6 +407,7 @@ 
			qcom,fs-curr-ua = <20000>;

			qcom,led-strings-list = [00 01];

			qcom,en-ext-pfet-sc-pro;

			qcom,pmic-revid = <&pmi8937_revid>;

			qcom,cons-sync-write-delay-us = <1000>;

		};
@@ -510,8 +494,8 @@ 
		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

				<0x3 0xc0 0x1>;

			interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,

				     <0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "sc-irq", "play-irq";

			qcom,pmic-revid = <&pmi8937_revid>;

			vcc_pon-supply = <&pon_perph_reg>;

arch/arm64/boot/dts/qcom/pmi8940.dtsi

+69 −86
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2016-2018, 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
@@ -14,10 +14,9 @@ 
#include <dt-bindings/msm/power-on.h>



&spmi_bus {



	qcom,pmi8940@2 {

		spmi-slave-container;

		reg = <0x2>;

		compatible ="qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -45,7 +44,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x2 0x31 0x0>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;
@@ -141,35 +140,19 @@ 
		};



		pmi8940_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			compatible = "qcom,spmi-mpp";

			reg = <0xa000 0x400>;

			interrupts = <0x2 0xa0 0 IRQ_TYPE_NONE>,

				     <0x2 0xa1 0 IRQ_TYPE_NONE>,

				     <0x2 0xa2 0 IRQ_TYPE_NONE>,

				     <0x2 0xa3 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi8940_mpp1", "pmi8940_mpp2",

					  "pmi8940_mpp3", "pmi8940_mpp4";

			gpio-controller;

			#gpio-cells = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			label = "pmi8940-mpp";



			mpp@a000 {

				reg = <0xa000 0x100>;

				qcom,pin-num = <1>;

				status = "disabled";

			};



			mpp@a100 {

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				status = "disabled";

			};



			mpp@a300 {

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				status = "disabled";

			};

		};



		pmi8940_charger: qcom,qpnp-smbcharger {

			spmi-dev-container;

			compatible = "qcom,qpnp-smbcharger";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -188,14 +171,14 @@ 


			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x2 0x10 0x0>,

						<0x2 0x10 0x1>,

						<0x2 0x10 0x2>,

						<0x2 0x10 0x3>,

						<0x2 0x10 0x4>,

						<0x2 0x10 0x5>,

						<0x2 0x10 0x6>,

						<0x2 0x10 0x7>;

				interrupts =	<0x2 0x10 0x0 IRQ_TYPE_NONE>,

						<0x2 0x10 0x1 IRQ_TYPE_NONE>,

						<0x2 0x10 0x2 IRQ_TYPE_NONE>,

						<0x2 0x10 0x3 IRQ_TYPE_NONE>,

						<0x2 0x10 0x4 IRQ_TYPE_NONE>,

						<0x2 0x10 0x5 IRQ_TYPE_NONE>,

						<0x2 0x10 0x6 IRQ_TYPE_NONE>,

						<0x2 0x10 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"chg-error",

							"chg-inhibit",
@@ -209,9 +192,9 @@ 


			qcom,otg@1100 {

				reg = <0x1100 0x100>;

				interrupts =	<0x2 0x11 0x0>,

						<0x2 0x11 0x1>,

						<0x2 0x11 0x3>;

				interrupts =	<0x2 0x11 0x0 IRQ_TYPE_NONE>,

						<0x2 0x11 0x1 IRQ_TYPE_NONE>,

						<0x2 0x11 0x3 IRQ_TYPE_NONE>;

				interrupt-names =	"otg-fail",

							"otg-oc",

						"usbid-change";
@@ -219,14 +202,14 @@ 


			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts =	<0x2 0x12 0x0>,

						<0x2 0x12 0x1>,

						<0x2 0x12 0x2>,

						<0x2 0x12 0x3>,

					<0x2 0x12 0x4>,

						<0x2 0x12 0x5>,

						<0x2 0x12 0x6>,

						<0x2 0x12 0x7>;

				interrupts =	<0x2 0x12 0x0 IRQ_TYPE_NONE>,

						<0x2 0x12 0x1 IRQ_TYPE_NONE>,

						<0x2 0x12 0x2 IRQ_TYPE_NONE>,

						<0x2 0x12 0x3 IRQ_TYPE_NONE>,

						<0x2 0x12 0x4 IRQ_TYPE_NONE>,

						<0x2 0x12 0x5 IRQ_TYPE_NONE>,

						<0x2 0x12 0x6 IRQ_TYPE_NONE>,

						<0x2 0x12 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"batt-hot",

							"batt-warm",
@@ -240,10 +223,10 @@ 


			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =	<0x2 0x13 0x0>,

						<0x2 0x13 0x1>,

					<0x2 0x13 0x2>,

						<0x2 0x13 0x5>;

				interrupts =	<0x2 0x13 0x0 IRQ_TYPE_NONE>,

						<0x2 0x13 0x1 IRQ_TYPE_NONE>,

						<0x2 0x13 0x2 IRQ_TYPE_NONE>,

						<0x2 0x13 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"usbin-uv",

						"usbin-ov",
@@ -253,20 +236,20 @@ 


			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

				interrupts =	<0x2 0x14 0x0>,

						<0x2 0x14 0x1>;

				interrupts =	<0x2 0x14 0x0 IRQ_TYPE_NONE>,

						<0x2 0x14 0x1 IRQ_TYPE_NONE>;

				interrupt-names =	"dcin-uv",

							"dcin-ov";

			};



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts =	<0x2 0x16 0x0>,

						<0x2 0x16 0x1>,

						<0x2 0x16 0x2>,

					<0x2 0x16 0x3>,

						<0x2 0x16 0x4>,

						<0x2 0x16 0x5>;

				interrupts =	<0x2 0x16 0x0 IRQ_TYPE_NONE>,

						<0x2 0x16 0x1 IRQ_TYPE_NONE>,

						<0x2 0x16 0x2 IRQ_TYPE_NONE>,

						<0x2 0x16 0x3 IRQ_TYPE_NONE>,

						<0x2 0x16 0x4 IRQ_TYPE_NONE>,

						<0x2 0x16 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"power-ok",

							"temp-shutdown",
@@ -282,7 +265,6 @@ 
		};



		pmi8940_fg: qcom,fg {

			spmi-dev-container;

			compatible = "qcom,qpnp-fg";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -300,13 +282,13 @@ 
			qcom,fg-soc@4000 {

			status = "okay";

				reg = <0x4000 0x100>;

				interrupts =	<0x2 0x40 0x0>,

						<0x2 0x40 0x1>,

						<0x2 0x40 0x2>,

						<0x2 0x40 0x3>,

						<0x2 0x40 0x4>,

						<0x2 0x40 0x5>,

						<0x2 0x40 0x6>;

				interrupts =	<0x2 0x40 0x0 IRQ_TYPE_NONE>,

						<0x2 0x40 0x1 IRQ_TYPE_NONE>,

						<0x2 0x40 0x2 IRQ_TYPE_NONE>,

						<0x2 0x40 0x3 IRQ_TYPE_NONE>,

						<0x2 0x40 0x4 IRQ_TYPE_NONE>,

						<0x2 0x40 0x5 IRQ_TYPE_NONE>,

						<0x2 0x40 0x6 IRQ_TYPE_NONE>;



				interrupt-names =	"high-soc",

							"low-soc",
@@ -319,14 +301,14 @@ 


			qcom,fg-batt@4100 {

				reg = <0x4100 0x100>;

				interrupts =	<0x2 0x41 0x0>,

						<0x2 0x41 0x1>,

					<0x2 0x41 0x2>,

						<0x2 0x41 0x3>,

						<0x2 0x41 0x4>,

						<0x2 0x41 0x5>,

						<0x2 0x41 0x6>,

						<0x2 0x41 0x7>;

				interrupts =	<0x2 0x41 0x0 IRQ_TYPE_NONE>,

						<0x2 0x41 0x1 IRQ_TYPE_NONE>,

						<0x2 0x41 0x2 IRQ_TYPE_NONE>,

						<0x2 0x41 0x3 IRQ_TYPE_NONE>,

						<0x2 0x41 0x4 IRQ_TYPE_NONE>,

						<0x2 0x41 0x5 IRQ_TYPE_NONE>,

						<0x2 0x41 0x6 IRQ_TYPE_NONE>,

						<0x2 0x41 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"soft-cold",

							"soft-hot",
@@ -345,8 +327,8 @@ 
			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

				interrupts =	<0x2 0x44 0x0>,

						<0x2 0x44 0x2>;

				interrupts =	<0x2 0x44 0x0 IRQ_TYPE_NONE>,

						<0x2 0x44 0x2 IRQ_TYPE_NONE>;



				interrupt-names =	"mem-avail",

							"data-rcvry-sug";
@@ -357,8 +339,8 @@ 
			compatible = "qcom,msm-bcl";

			reg = <0x4200 0xff>;

			reg-names = "fg_user_adc";

			interrupts = <0x2 0x42 0x0>,

					<0x2 0x42 0x1>;

			interrupts = <0x2 0x42 0x0 IRQ_TYPE_NONE>,

				     <0x2 0x42 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-high-ibat-int",

					"bcl-low-vbat-int";

			qcom,vbat-scaling-factor = <39000>;
@@ -381,8 +363,8 @@ 
	};



	qcom,pmi8940@3 {

		spmi-slave-container;

		reg = <0x3>;

		compatible ="qcom,spmi-pmic";

		reg = <0x3 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -398,10 +380,10 @@ 


		labibb: qpnp-labibb-regulator {

			status = "disabled";

			spmi-dev-container;

			compatible = "qcom,qpnp-labibb-regulator";

			#address-cells = <1>;

			#size-cells = <1>;

			qcom,qpnp-labibb-mode = "lcd";

			qcom,pmic-revid = <&pmi8940_revid>;



			ibb_regulator: qcom,ibb@dc00 {
@@ -475,7 +457,7 @@ 
				<0xd900 0x100>;

			reg-names = "qpnp-wled-ctrl-base",

					"qpnp-wled-sink-base";

			interrupts = <0x3 0xd8 0x2>;

			interrupts = <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "sc-irq";

			status = "okay";

			linux,name = "wled";
@@ -495,6 +477,7 @@ 
			qcom,en-phase-stag;

			qcom,led-strings-list = [00 01];

			qcom,en-ext-pfet-sc-pro;

			qcom,pmic-revid = <&pmi8940_revid>;

			qcom,cons-sync-write-delay-us = <1000>;

		};
@@ -581,8 +564,8 @@ 
		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

				<0x3 0xc0 0x1>;

			interrupts = <0x3 0xc0 0x0 IRQ_TYPE_EDGE_BOTH>,

				     <0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "sc-irq", "play-irq";

			qcom,pmic-revid = <&pmi8940_revid>;

			vcc_pon-supply = <&pon_perph_reg>;