summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-11-02 16:31:52 +0800
committerZhang Rui <rui.zhang@intel.com>2017-11-02 16:31:52 +0800
commitfe9ba5bc73af01f7d53bb6b2b31204f799dd09be (patch)
treead68935d28d4616eefdefb95b4e10d3d85f11b29 /Documentation/devicetree/bindings/thermal
parentb2fd708ffa7f43ce8680271924e1771e26a3ec91 (diff)
parent531fcdeb71f0be1d4c77838b1a4694c317b1eb98 (diff)
downloadblackbird-op-linux-fe9ba5bc73af01f7d53bb6b2b31204f799dd09be.tar.gz
blackbird-op-linux-fe9ba5bc73af01f7d53bb6b2b31204f799dd09be.zip
Merge branch 'imx-nvmem' into thermal-soc
Diffstat (limited to 'Documentation/devicetree/bindings/thermal')
-rw-r--r--Documentation/devicetree/bindings/thermal/imx-thermal.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.txt b/Documentation/devicetree/bindings/thermal/imx-thermal.txt
index 3c67bd50aa10..28be51afdb6a 100644
--- a/Documentation/devicetree/bindings/thermal/imx-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/imx-thermal.txt
@@ -7,10 +7,17 @@ Required properties:
is higher than panic threshold, system will auto reboot by SRC module.
- fsl,tempmon : phandle pointer to system controller that contains TEMPMON
control registers, e.g. ANATOP on imx6q.
+- nvmem-cells: A phandle to the calibration cells provided by ocotp.
+- nvmem-cell-names: Should be "calib", "temp_grade".
+
+Deprecated properties:
- fsl,tempmon-data : phandle pointer to fuse controller that contains TEMPMON
calibration data, e.g. OCOTP on imx6q. The details about calibration data
can be found in SoC Reference Manual.
+Direct access to OCOTP via fsl,tempmon-data is incorrect on some newer chips
+because it does not handle OCOTP clock requirements.
+
Optional properties:
- clocks : thermal sensor's clock source.
OpenPOWER on IntegriCloud