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

Commit 36981829 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: Modify TSENS binding names"

parents 36c1ba1d 2c5d60c2

Documentation/devicetree/bindings/thermal/tsens.txt

+12 −12
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ threshold events. 
TSENS node



Required properties:

- compatible : should be "qcom,msm-tsens" for MSM8974 TSENS driver.

- compatible : should be "qti,msm-tsens" for MSM8974 TSENS driver.

- reg : offset and length of the TSENS registers.

- reg : offset and length of the QFPROM registers used for storing

	the calibration data for the individual sensors.
@@ -24,40 +24,40 @@ Required properties: 
	      calibration address region if TSENS calibration data is stored

	      in the region.

- interrupts : TSENS interrupt for cool/warm temperature threshold.

- qcom,sensors : Total number of available Temperature sensors for TSENS.

- qcom,slope : One point calibration characterized slope data for each

- qti,sensors : Total number of available Temperature sensors for TSENS.

- qti,slope : One point calibration characterized slope data for each

	       sensor used to compute the offset. Slope is represented

	       as ADC code/DegC and the value is multipled by a factor

	       of 1000.

- qcom,calib-mode : Calibration masks to use to abstract the offset data from efuse.

- qti,calib-mode : Calibration masks to use to abstract the offset data from efuse.

		    Select from the following strings.

		    "fuse_map1" : Used for 8974/9x25 fuse calibration map.

		    "fuse_map2" : Used for 8x26 fuse calibration map.

		    "fuse_map3" : Used for 8x10 fuse calibration map.



Optional properties:

- qcom,calibration-less-mode : If present the pre-characterized data for offsets

- qti,calibration-less-mode : If present the pre-characterized data for offsets

		are used else it defaults to use calibration data from QFPROM.

- qcom,tsens-local-init : If the flag is present the TSENS control registers are

- qti,tsens-local-init : If the flag is present the TSENS control registers are

		initialized. If the boot configures the control register there is

		no need to re-initialize them. The control registers are also

		under a secure domain which can prevent them from being initialized

		locally.

- qcom,sensor-id : If the flag is present map the TSENS sensors based on the

- qti,sensor-id : If the flag is present map the TSENS sensors based on the

		remote sensors that are enabled in HW. Ensure the mapping is not

		more than the number of supported sensors.

Example:



tsens@fc4a8000 {

	compatible = "qcom,msm-tsens";

	compatible = "qti,msm-tsens";

	reg = <0xfc4a8000 0x2000>,

	      <0xfc4b8000 0x1000>;

	reg-names = "tsens_physical",

		    "tsens_eeprom_physical";

	interrupts = <0 184 0>;

	qcom,calibration-less-mode;

	qcom,sensors = <11>;

	qcom,slope = <3200 3200 3200 3200 3200 3200 3200 3200 3200

	qti,calibration-less-mode;

	qti,sensors = <11>;

	qti,slope = <3200 3200 3200 3200 3200 3200 3200 3200 3200

			3200>;

	qcom,calib-mode = "fuse_map1";

	qti,calib-mode = "fuse_map1";

};

arch/arm/boot/dts/qti/apq8026-v1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
};



&tsens {

	qcom,sensors = <4>;

	qcom,slope = <2901 2846 3038 2955>;

	qti,sensors = <4>;

	qti,slope = <2901 2846 3038 2955>;

};

arch/arm/boot/dts/qti/apq8026-v2.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
};



&tsens {

	qcom,sensors = <6>;

	qcom,slope = <2901 2846 3038 2955 2901 2846>;

	qti,sensors = <6>;

	qti,slope = <2901 2846 3038 2955 2901 2846>;

};

arch/arm/boot/dts/qti/apq8084.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -1837,15 +1837,15 @@ 
	};



	tsens: tsens@fc4a8000 {

		compatible = "qcom,msm-tsens";

		compatible = "qti,msm-tsens";

		reg = <0xfc4a8000 0x2000>,

		      <0xfc4bc000 0x1000>;

		reg-names = "tsens_physical", "tsens_eeprom_physical";

		interrupts = <0 184 0>;

		qcom,sensors = <11>;

		qcom,slope = <3200 3200 3200 3200 3200 3200 3200 3200 3200

		qti,sensors = <11>;

		qti,slope = <3200 3200 3200 3200 3200 3200 3200 3200 3200

				3200 3200>;

		qcom,calib-mode = "fuse_map1";

		qti,calib-mode = "fuse_map1";

	};



	xhci_hsic_host: qcom,xhci-msm-hsic@0xf9c00000 {

arch/arm/boot/dts/qti/fsm9900.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -500,14 +500,14 @@ 
	};



	tsens: tsens@fc4a8000 {

		compatible = "qcom,msm-tsens";

		compatible = "qti,msm-tsens";

		reg = <0xfc4a8000 0x2000>,

			<0xfc4bc000 0x1000>;

		reg-names = "tsens_physical", "tsens_eeprom_physical";

		interrupts = <0 184 0>;

		qcom,sensors = <7>;

		qcom,slope = <3200 3200 3200 3200 3200 3200 3200>;

		qcom,calib-mode = "fuse_map4";

		qti,sensors = <7>;

		qti,slope = <3200 3200 3200 3200 3200 3200 3200>;

		qti,calib-mode = "fuse_map4";

	};

	qcom,msm-thermal {

		compatible = "qcom,msm-thermal";