Merge branch 'arm64-for-4.21' into arm64-for-4.21-3 (9b08a32b) · Commits · e / devices / android_kernel_fairphone_FP5

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -140,6 +140,10 @@ VADC_GND_REF and VADC_VDD_VADC.

		Example:

		#include <dt-bindings/iio/qcom,spmi-vadc.h>
		#include <linux/irq.h>
		/* ... */

		/* VADC node */
		pmic_vadc: vadc@3100 {
		compatible = "qcom,spmi-vadc";
		@@ -151,7 +155,7 @@ Example:
		io-channel-ranges;

		/* Channel node */
		usb_id_nopull {
		adc-chan@VADC_LR_MUX10_USB_ID {
		reg = <VADC_LR_MUX10_USB_ID>;
		qcom,decimation = <512>;
		qcom,ratiometric;

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

+45 −2

Original line number	Diff line number	Diff line
		@@ -234,6 +234,47 @@
		};
		};

		gpu-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 2>;

		trips {
		gpu_alert: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		gpu_crit: trip1 {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};

		camera-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 1>;

		trips {
		cam_alert: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cam_crit: trip1 {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};

		};

		};

		cpu_opp_table: cpu_opp_table {
		@@ -758,11 +799,13 @@
		};
		};

		tsens: thermal-sensor@4a8000 {
		tsens: thermal-sensor@4a9000 {
		compatible = "qcom,msm8916-tsens";
		reg = <0x4a8000 0x2000>;
		reg = <0x4a9000 0x1000>, /* TM */
		<0x4a8000 0x1000>; /* SROT */
		nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
		nvmem-cell-names = "calib", "calib_sel";
		#qcom,sensors = <5>;
		#thermal-sensor-cells = <1>;
		};

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,13 @@
		reg = <0x68000 0x6000>;
		};

		rng: rng@83000 {
		compatible = "qcom,prng-ee";
		reg = <0x00083000 0x1000>;
		clocks = <&gcc GCC_PRNG_AHB_CLK>;
		clock-names = "core";
		};

		tcsr_mutex_regs: syscon@740000 {
		compatible = "syscon";
		reg = <0x740000 0x20000>;

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,11 @@
		#address-cells = <1>;
		#size-cells = <0>;
		#io-channel-cells = <1>;

		adc-chan@ADC5_DIE_TEMP {
		reg = <ADC5_DIE_TEMP>;
		label = "die_temp";
		};
		};

		rtc@6000 {

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

+178 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <dt-bindings/phy/phy-qcom-qusb2.h>
		#include <dt-bindings/reset/qcom,sdm845-aoss.h>
		#include <dt-bindings/soc/qcom,rpmh-rsc.h>
		#include <dt-bindings/clock/qcom,gcc-sdm845.h>

		/ {
		interrupt-parent = <&intc>;
		@@ -357,6 +358,13 @@
		};
		};

		rng: rng@793000 {
		compatible = "qcom,prng-ee";
		reg = <0x00793000 0x1000>;
		clocks = <&gcc GCC_PRNG_AHB_CLK>;
		clock-names = "core";
		};

		qupv3_id_0: geniqup@8c0000 {
		compatible = "qcom,geni-se-qup";
		reg = <0x8c0000 0x6000>;
		@@ -1404,4 +1412,174 @@
		};
		};
		};

		thermal-zones {
		cpu0-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 1>;

		trips {
		cpu_alert0: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit0: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 2>;

		trips {
		cpu_alert1: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit1: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 3>;

		trips {
		cpu_alert2: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit2: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu3-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 4>;

		trips {
		cpu_alert3: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit3: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu4-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 7>;

		trips {
		cpu_alert4: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit4: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu5-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 8>;

		trips {
		cpu_alert5: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit5: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu6-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 9>;

		trips {
		cpu_alert6: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit6: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};

		cpu7-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 10>;

		trips {
		cpu_alert7: trip0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit7: trip1 {
		temperature = <110000>;
		hysteresis = <1000>;
		type = "critical";
		};
		};
		};
		};
		};