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

Commit ae2af11a 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 SPM node structure for msm8905"

parents 05a1b43b 3a0f32d1

arch/arm64/boot/dts/qcom/msm-pm8909-rpm-regulator.dtsi

deleted100644 → 0
+0 −317
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 2020, 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.

 */



&rpm_bus {

	rpm-regulator-smpa1 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "smpa";

		qcom,resource-id = <1>;

		qcom,regulator-type = <1>;

		qcom,hpm-min-load = <100000>;

		status = "disabled";



		regulator-s1 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_s1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa2 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "smpa";

		qcom,resource-id = <2>;

		qcom,regulator-type = <1>;

		qcom,hpm-min-load = <100000>;

		status = "disabled";



		regulator-s2 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_s2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa1 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <1>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l1 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa2 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <2>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l2 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa3 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <3>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l3 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l3";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa4 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <4>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l4 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l4";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa5 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <5>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l5 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa6 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <6>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l6 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l6";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa7 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <7>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l7 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l7";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa8 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <8>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l8 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l8";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa9 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <9>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l9 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l9";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa10 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <10>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l10 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l10";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa11 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <11>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l11 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l11";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa12 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <12>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l12 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l12";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa13 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <13>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <5000>;

		status = "disabled";



		regulator-l13 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l13";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa14 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <14>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <5000>;

		status = "disabled";



		regulator-l14 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l14";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa15 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <15>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <5000>;

		status = "disabled";



		regulator-l15 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l15";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa17 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <17>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l17 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l17";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa18 {

		compatible = "qcom,rpm-smd-regulator-resource";

		qcom,resource-name = "ldoa";

		qcom,resource-id = <18>;

		qcom,regulator-type = <0>;

		qcom,hpm-min-load = <10000>;

		status = "disabled";



		regulator-l18 {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "pm8909_l18";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

arch/arm64/boot/dts/qcom/msm-pm8909.dtsi

+74 −48
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


&spmi_bus {



	qcom,pm8909@0 {

		spmi-slave-container;

		reg = <0x0>;

		#address-cells = <1>;

		#size-cells = <1>;

	pm8909_0: qcom,pm8909@0 {

		compatible ="qcom,spmi-pmic";

		reg = <0x0 0>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm8909_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -26,17 +26,16 @@ 
		pm8909_pon: qcom,power-on@800 {

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

			reg = <0x800 0x100>;

			interrupts = <0x0 0x8 0x0>,

				     <0x0 0x8 0x1>;

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

				     <0x0 0x8 0x1 0x0>;

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

			qcom,pon-dbc-delay = <15625>;

			qcom,kpdpwr-sw-debounce;

			qcom,system-reset;

			qcom,clear-warm-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;

				qcom,support-reset = <1>;

				qcom,pull-up = <1>;

				qcom,s1-timer = <10256>;

				qcom,s2-timer = <2000>;
@@ -116,7 +115,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

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

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

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

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

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

					<0x0 0x34 0x4>;

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

					<0x0 0x34 0x3 0x0>,

					<0x0 0x34 0x4 0x0>;

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

						"high-thr-en-set",

						"low-thr-en-set";
@@ -186,7 +185,7 @@ 
			};

			qcom,pm8909_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x0 0x61 0x1>;

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

			};

		};
@@ -219,14 +218,14 @@ 
			qcom,chg-vadc = <&pm8909_vadc>;

			qcom,chg-adc_tm = <&pm8909_adc_tm>;



			status = "disabled";

			status = "okay";



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x0 0x10 0x7>,

						<0x0 0x10 0x6>,

						<0x0 0x10 0x5>,

						<0x0 0x10 0x0>;

				interrupts =	<0x0 0x10 0x7 0x1>,

						<0x0 0x10 0x6 0x1>,

						<0x0 0x10 0x5 0x3>,

						<0x0 0x10 0x0 0x2>;

				interrupt-names =	"chg-done",

							"chg-failed",

							"fast-chg-on",
@@ -235,17 +234,17 @@ 


			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts =	<0x0 0x12 0x1>,

						<0x0 0x12 0x0>;

				interrupts =	<0x0 0x12 0x1 0x3>,

						<0x0 0x12 0x0 0x3>;

				interrupt-names =	"bat-temp-ok",

							"batt-pres";

			};



			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =	<0 0x13 0x4>,

						<0 0x13 0x2>,

						<0 0x13 0x1>;

				interrupts =	<0 0x13 0x4 0x3>,

						<0 0x13 0x2 0x1>,

						<0 0x13 0x1 0x3>;

				interrupt-names =	"usb-over-temp",

							"chg-gone",

							"usbin-valid";
@@ -259,7 +258,7 @@ 
		pm8909_tz: qcom,temp-alarm@2400 {

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

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0>;

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

			label = "pm8909_tz";

			qcom,channel-num = <8>;

			qcom,threshold-set = <0>;
@@ -305,10 +304,10 @@ 


			qcom,vm-bms@4000 {

				reg = <0x4000 0x100>;

				interrupts =	<0x0 0x40 0x0>,

						<0x0 0x40 0x3>,

						<0x0 0x40 0x4>,

						<0x0 0x40 0x5>;

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

						<0x0 0x40 0x3 0x0>,

						<0x0 0x40 0x4 0x0>,

						<0x0 0x40 0x5 0x0>;



				interrupt-names = "leave_cv",

						  "ocv_thr",
@@ -318,11 +317,38 @@ 
		};

	};



	qcom,pm8909@1 {

		spmi-slave-container;

		reg = <0x1>;

		#address-cells = <1>;

		#size-cells = <1>;



	pm8909_temp_alarm: pm8909_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8909_tz>;

		wake-capable-sensor;



		trips {

			pm8909_trip0: pm8909-trip0 {

				temperature = <105000>;

				hysteresis = <0>;

				type = "passive";

			};

			pm8909_trip1: pm8909-trip1 {

				temperature = <125000>;

				hysteresis = <0>;

				type = "passive";

			};

			pm8909_trip2: pm8909-trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};



	pm8909_1: qcom,pm8909@1 {

		compatible ="qcom,spmi-pmic";

		reg = <0x1 0>;

		#address-cells = <2>;

		#size-cells = <0>;



		regulator@1400 {

			compatible = "qcom,qpnp-regulator";
@@ -494,14 +520,14 @@ 
			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf000 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf0 0x0>,

				     <0x1 0xf0 0x1>,

				     <0x1 0xf0 0x2>,

				     <0x1 0xf0 0x3>,

				     <0x1 0xf0 0x4>,

				     <0x1 0xf0 0x5>,

				     <0x1 0xf0 0x6>,

				     <0x1 0xf0 0x7>;

			interrupts = <0x1 0xf0 0x0 0x0>,

				     <0x1 0xf0 0x1 0x0>,

				     <0x1 0xf0 0x2 0x0>,

				     <0x1 0xf0 0x3 0x0>,

				     <0x1 0xf0 0x4 0x0>,

				     <0x1 0xf0 0x5 0x0>,

				     <0x1 0xf0 0x6 0x0>,

				     <0x1 0xf0 0x7 0x0>;

			interrupt-names = "spk_cnp_int",

					  "spk_clip_int",

					  "spk_ocp_int",
@@ -545,12 +571,12 @@ 
			compatible = "qcom,msm8x16_wcd_codec";

			reg = <0xf100 0x100>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x1 0xf1 0x0>,

				     <0x1 0xf1 0x1>,

				     <0x1 0xf1 0x2>,

				     <0x1 0xf1 0x3>,

				     <0x1 0xf1 0x4>,

				     <0x1 0xf1 0x5>;

			interrupts = <0x1 0xf1 0x0 0x0>,

				     <0x1 0xf1 0x1 0x0>,

				     <0x1 0xf1 0x2 0x0>,

				     <0x1 0xf1 0x3 0x0>,

				     <0x1 0xf1 0x4 0x0>,

				     <0x1 0xf1 0x5 0x0>;

			interrupt-names = "ear_ocp_int",

					  "hphr_ocp_int",

					  "hphl_ocp_det",

arch/arm64/boot/dts/qcom/msm8905-512mb-memory_qseev4.dtsi

+19 −1
Original line number Diff line number Diff line
@@ -11,6 +11,20 @@ 
 * GNU General Public License for more details.

 */



&soc {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;



			qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

				reg = <10>;

				memory-region = <&secure_display_memory>;

				qcom,ion-heap-type = "SECURE_DMA";

			};

	};

};



&external_image_mem {

	reg = <0x0 0x87900000 0x0 0x700000>;

};
@@ -43,3 +57,7 @@ 
		vddio-supply = <&pm8909_l6>;

	};

};



&apps_iommu {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8905-qrd-sku3.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ 
	qcom,platform-te-gpio = <&msm_gpio 24 0>;

	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

	qcom,platform-spi-dc-gpio = <&msm_gpio 110 0>;



	vdd-supply = <&pm8909_l17>;

	vddio-supply = <&pm8909_l6>;

};



&qnand_1 {

arch/arm64/boot/dts/qcom/msm8905-qrd-skub.dtsi

+43 −8
Original line number Diff line number Diff line
@@ -77,6 +77,13 @@ 
	};

};



&pm8909_chg {

	status = "ok";

};



&usb_otg {

	extcon = <&pm8909_chg>;

};

&msm_gpio {

	tlmm_gpio_key {

		qcom,pin-func = <0>;
@@ -106,13 +113,18 @@ 
		pm8909_pon: qcom,power-on@800 {

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

			reg = <0x800 0x100>;

			interrupts = <0x0 0x8 0x0>,

					   <0x0 0x8 0x1>;

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

					   <0x0 0x8 0x1 0x0>;

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

			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,clear-warm-reset;



			qcom,pon_1 {

				qcom,pon-type = <0>;

				qcom,pull-up = <1>;

				linux,code = <116>;

			};

			qcom,pon_2 {

				qcom,pon-type = <1>;

				qcom,pull-up = <1>;
@@ -214,7 +226,7 @@ 
		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

		/*qcom,vadc-thermal-node;*/

	};

};
@@ -387,6 +399,9 @@ 
	qcom,platform-te-gpio = <&msm_gpio 24 0>;

	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

	qcom,platform-spi-dc-gpio = <&msm_gpio 110 0>;



	vdd-supply = <&pm8909_l17>;

	vddio-supply = <&pm8909_l6>;

};



&pm8909_gpios {
@@ -421,3 +436,23 @@ 
		clock-names = "ref_clk";

	};

};



&vendor_fstab {

	status = "disabled";

};



&system_fstab {

	status = "disabled";

};



&blsp1_uart1 {

	status = "ok";

};



&blsp1_uart2 {

	status = "ok";

};



&actuator0 {

	status = "disabled";

};