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

Commit 50383ed3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add thermal zones for pm2250"

parents 98a362ea 9bd36437

qcom/pm2250.dtsi

+53 −38
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 
	qcom,pm2250@0 {

		compatible = "qcom,spmi-pmic";

		reg = <0 SPMI_USID>;

		#address-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		pm2250_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";

			reg = <0x100 0x100>;

			reg = <0x100>;

		};



		qcom,power-on@800 {

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

			reg = <0x800 0x100>;

			reg = <0x800>;

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

					<0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "kpdpwr", "resin";
@@ -47,7 +47,7 @@ 


		pm2250_tz: qcom,temp-alarm@2400 {

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

			reg = <0x2400 0x100>;

			reg = <0x2400>;

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

			io-channels = <&pm2250_vadc ADC5_DIE_TEMP>;

			io-channel-names = "thermal";
@@ -57,7 +57,7 @@ 


		pm2250_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5-lite";

			reg = <0x3100 0x100>;

			reg = <0x3100>;

			reg-names = "adc5-usr-base";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -157,27 +157,12 @@ 




		pm2250_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0xa00>;

			interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,

					<0x0 0xc1 0 IRQ_TYPE_NONE>,

					<0x0 0xc2 0 IRQ_TYPE_NONE>,

					<0x0 0xc3 0 IRQ_TYPE_NONE>,

					<0x0 0xc4 0 IRQ_TYPE_NONE>,

					<0x0 0xc5 0 IRQ_TYPE_NONE>,

					<0x0 0xc6 0 IRQ_TYPE_NONE>,

					<0x0 0xc7 0 IRQ_TYPE_NONE>,

					<0x0 0xc8 0 IRQ_TYPE_NONE>,

					<0x0 0xc9 0 IRQ_TYPE_NONE>;



			interrupt-names = "pm2250_gpio1", "pm2250_gpio2",

					"pm2250_gpio3", "pm2250_gpio4",

					"pm2250_gpio5", "pm2250_gpio6",

					"pm2250_gpio7", "pm2250_gpio8",

					"pm2250_gpio9", "pm2250_gpio10";



			compatible = "qcom,pm2250-gpio";

			reg = <0xc000>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		pm2250_rtc: qcom,pm2250_rtc {
@@ -204,7 +189,7 @@ 


			qcom,qgauge@4800 {

				status = "okay";

				reg = <0x4800 0x100>;

				reg = <0x4800>;

				interrupts =

					<0x0 0x48 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x48 0x3 IRQ_TYPE_EDGE_RISING>,
@@ -216,7 +201,7 @@ 


			qcom,qg-sdam@b600 {

				status = "okay";

				reg = <0xb600 0x100>;

				reg = <0xb600>;

			};

		};
@@ -228,7 +213,7 @@ 


			qcom,pmic-revid = <&pm2250_revid>;

			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				reg = <0x1000>;

				interrupts =

					<0x0 0x10 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x0 IRQ_TYPE_EDGE_RISING>,
@@ -242,7 +227,7 @@ 
			};



			qcom,dcdc@1100 {

				reg = <0x1100 0x100>;

				reg = <0x1100>;

				interrupts =

					<0x0 0x11 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x11 0x1 IRQ_TYPE_EDGE_RISING>,
@@ -258,7 +243,7 @@ 
			};



			qcom,batif@1200 {

				reg = <0x1200 0x100>;

				reg = <0x1200>;

				interrupts =

					<0x0 0x12 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x1 IRQ_TYPE_EDGE_BOTH>,
@@ -274,7 +259,7 @@ 
			};



			qcom,usb@1300 {

				reg = <0x1300 0x100>;

				reg = <0x1300>;

				interrupts =

					<0x0 0x13 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x1 IRQ_TYPE_EDGE_BOTH>,
@@ -292,7 +277,7 @@ 
			};



			qcom,typec@1500 {

				reg = <0x1500 0x100>;

				reg = <0x1500>;

				interrupts =

					<0x0 0x15 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x15 0x1 IRQ_TYPE_EDGE_BOTH>,
@@ -312,7 +297,7 @@ 
			};



			qcom,misc@1600 {

				reg = <0x1600 0x100>;

				reg = <0x1600>;

				interrupts =

					<0x0 0x16 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x1 IRQ_TYPE_EDGE_RISING>,
@@ -332,7 +317,7 @@ 
			};



			qcom,schgm-flashlite@a600 {

				reg = <0xa600 0x100>;

				reg = <0xa600>;

				interrupts =

					<0x0 0xa6 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xa6 0x5 IRQ_TYPE_EDGE_RISING>,
@@ -350,19 +335,19 @@ 
	pm2250_1: qcom,pm2250@1 {

		compatible = "qcom,spmi-pmic";

		reg = <1 SPMI_USID>;

		#address-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		pm2250_vib: qcom,vibrator@5600 {

			compatible = "qcom,qpnp-vibrator-ldo";

			reg = <0x5600 0x100>;

			reg = <0x5600>;

			qcom,vib-ldo-volt-uv = <3000000>;

			qcom,disable-overdrive;

		};



		pm2250_pwm1: qcom,pwms@bc00 {

			compatible = "qcom,pwm-lpg";

			reg = <0xbc00 0x100>;

			reg = <0xbc00>;

			reg-names = "lpg-base";

			qcom,num-lpg-channels = <1>;

			#pwm-cells = <2>;
@@ -370,7 +355,7 @@ 


		pm2250_pwm2: qcom,pwms@bd00 {

			compatible = "qcom,pwm-lpg";

			reg = <0xbd00 0x100>;

			reg = <0xbd00>;

			reg-names = "lpg-base";

			qcom,num-lpg-channels = <1>;

			#pwm-cells = <2>;
@@ -378,10 +363,40 @@ 


		pm2250_pwm3: qcom,pwms@be00 {

			compatible = "qcom,pwm-lpg";

			reg = <0xbe00 0x100>;

			reg = <0xbe00>;

			reg-names = "lpg-base";

			qcom,num-lpg-channels = <1>;

			#pwm-cells = <2>;

		};

	};

};



&thermal_zones {

	pm2250_tz {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm2250_tz>;

		wake-capable-sensor;



		trips {

			pm2250_trip0: trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};



			pm2250_trip1: trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "critical";

			};



			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

qcom/scuba-iot.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ 
		qcom,guard-memory;

	};



	thermal_zones: thermal-zones { };



	qfprom: qfprom@1b40000 {

		compatible = "qcom,qfprom";

		reg = <0x1b40000 0x7000>;