Commit 38c2f382 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-for-5.2' of... 

Merge tag 'qcom-arm64-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt

Qualcomm ARM64 Updates for v5.2

* Add gpio ranges for Qualcomm platforms
* Fix MSM8998 BLSP2 I2C5 address
* Add MSM8998 UFS nodes and associated information
* Add SDM845 interconnect header and usage
* Add ADSP and CDSP PAS, RMTFS memory, and UFS phy reset on SDM845
* Update reserved memory map on SDM845
* Add QCS404 spmi regulators, ethernet, bluetooth, and uart3
* Remove remotely-controlled property as default for BAM on QCS404
* Add spmi regulators on PMS405
* Fixup QCS404 l3 voltages and regulator supply names
* Fixup thermal trip names on Qualcomm platforms
* Add thermal sensors on Qualcomm platforms
* Remove invalid efficiency property on MSM8998
* Change QCS404-evb compatible to help distinguish platforms
* Add rpmhd header file and convert to use definitions on SDM845
* Add interconnect header file on SDM845
* Add PMS405 ADC binding

* tag 'qcom-arm64-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

: (38 commits)
  arm64: dts: sdm845: Introduce ADSP and CDSP PAS nodes
  arm64: dts: qcom: sdm845: Define rmtfs memory
  arm64: dts: qcom: sdm845: Update reserved memory map
  arm64: dts: sdm845: Add UFS PHY reset
  arm64: dts: qcom: msm8998: Fix blsp2_i2c5 address
  arm64: dts: qcom: qcs404-evb: Change the compatible to distinguish platforms
  arm64: dts: qcom: pmi8998: add gpio-ranges
  arm64: dts: qcom: pmi8994: add gpio-ranges
  arm64: dts: qcom: pm8998: add gpio-ranges
  arm64: dts: qcom: pm8005: add gpio-ranges
  arm64: dts: msm8998: Add UFS phy reset
  arm64: dts: msm8916: thermal: Convert camera trip type to hot
  arm64: dts: msm8996: thermal: Make trip names consistent
  arm64: dts: msm8916: thermal: Make trip names consistent
  arm64: dts: msm8998: thermal: Make trip names consistent
  arm64: dts: sdm845: thermal: Add temperature sensors near major peripherals
  arm64: dts: msm8998: thermal: Add temperature sensors near major peripherals
  arm64: dts: msm8998: thermal: GPU has two sensors, add the second
  arm64: dts: msm8998: thermal: Fix the gpu sensor number
  arm64: dts: msm8998: thermal: Fix the cpu sensor numbers
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents be058ba6 6ef7c11b

Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ VADC node: 
    Definition: Should contain "qcom,spmi-vadc".

                Should contain "qcom,spmi-adc5" for PMIC5 ADC driver.

                Should contain "qcom,spmi-adc-rev2" for PMIC rev2 ADC driver.

                Should contain "qcom,pms405-adc" for PMS405 PMIC



- reg:

    Usage: required

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
			  the appropriate jedec string:

			    "qcom,msm8994-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,msm8996-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

- interrupts        : <interrupt mapping for UFS host controller IRQ>

- reg               : <registers mapping>

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

+25 −16
Original line number Diff line number Diff line
@@ -180,19 +180,19 @@ 
	};



	thermal-zones {

		cpu-thermal0 {

		cpu0_1-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 4>;



			trips {

				cpu_alert0: trip0 {

				cpu0_1_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit0: trip1 {

				cpu0_1_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";
@@ -201,7 +201,7 @@ 


			cooling-maps {

				map0 {

					trip = <&cpu_alert0>;

					trip = <&cpu0_1_alert0>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -210,19 +210,19 @@ 
			};

		};



		cpu-thermal1 {

		cpu2_3-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 3>;



			trips {

				cpu_alert1: trip0 {

				cpu2_3_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit1: trip1 {

				cpu2_3_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";
@@ -231,7 +231,7 @@ 


			cooling-maps {

				map0 {

					trip = <&cpu_alert1>;

					trip = <&cpu2_3_alert0>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -247,12 +247,12 @@ 
			thermal-sensors = <&tsens 2>;



			trips {

				gpu_alert: trip0 {

				gpu_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				gpu_crit: trip1 {

				gpu_crit: gpu_crit {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";
@@ -267,18 +267,27 @@ 
			thermal-sensors = <&tsens 1>;



			trips {

				cam_alert: trip0 {

				cam_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

					type = "hot";

				};

				cam_crit: trip1 {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

			};

		};



		modem-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 0>;



			trips {

				modem_alert0: trip-point@0 {

					temperature = <85000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



	};

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

+162 −12
Original line number Diff line number Diff line
@@ -154,20 +154,20 @@ 
	};



	thermal-zones {

		cpu-thermal0 {

		cpu0-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 3>;



			trips {

				cpu_alert0: trip0 {

				cpu0_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit0: trip1 {

				cpu0_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";
@@ -175,20 +175,20 @@ 
			};

		};



		cpu-thermal1 {

		cpu1-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 5>;



			trips {

				cpu_alert1: trip0 {

				cpu1_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit1: trip1 {

				cpu1_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";
@@ -196,20 +196,20 @@ 
			};

		};



		cpu-thermal2 {

		cpu2-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 8>;



			trips {

				cpu_alert2: trip0 {

				cpu2_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit2: trip1 {

				cpu2_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";
@@ -217,26 +217,176 @@ 
			};

		};



		cpu-thermal3 {

		cpu3-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 10>;



			trips {

				cpu_alert3: trip0 {

				cpu3_alert0: trip-point@0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit3: trip1 {

				cpu3_crit: cpu_crit {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		gpu-thermal-top {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 6>;



			trips {

				gpu1_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		gpu-thermal-bottom {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 7>;



			trips {

				gpu2_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		m4m-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 1>;



			trips {

				m4m_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		l3-or-venus-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 2>;



			trips {

				l3_or_venus_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		cluster0-l2-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 7>;



			trips {

				cluster0_l2_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		cluster1-l2-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens0 12>;



			trips {

				cluster1_l2_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		camera-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 1>;



			trips {

				camera_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		q6-dsp-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 2>;



			trips {

				q6_dsp_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		mem-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 3>;



			trips {

				mem_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		modemtx-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens1 4>;



			trips {

				modemtx_alert0: trip-point@0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};

	};



	timer {

arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
		vreg_s4a_1p8: s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-allow-set-load;

		};

		vreg_s5a_2p04: s5 {

			regulator-min-microvolt = <1904000>;
@@ -195,6 +196,7 @@ 
		vreg_l20a_2p95: l20 {

			regulator-min-microvolt = <2960000>;

			regulator-max-microvolt = <2960000>;

			regulator-allow-set-load;

		};

		vreg_l21a_2p95: l21 {

			regulator-min-microvolt = <2960000>;
@@ -221,6 +223,7 @@ 
		vreg_l26a_1p2: l26 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-allow-set-load;

		};

		vreg_l28_3p0: l28 {

			regulator-min-microvolt = <3008000>;
@@ -267,6 +270,25 @@ 
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;

};



&ufshc {

	vcc-supply = <&vreg_l20a_2p95>;

	vccq-supply = <&vreg_l26a_1p2>;

	vccq2-supply = <&vreg_s4a_1p8>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <560000>;

	vccq2-max-microamp = <750000>;

};



&ufsphy {

	vdda-phy-supply = <&vreg_l1a_0p875>;

	vdda-pll-supply = <&vreg_l2a_1p2>;

	vddp-ref-clk-supply = <&vreg_l26a_1p2>;

	vdda-phy-max-microamp = <51400>;

	vdda-pll-max-microamp = <14600>;

	vddp-ref-clk-max-microamp = <100>;

	vddp-ref-clk-always-on;

};



&usb3 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE