Merge tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[~andy/linux] / Documentation / devicetree / bindings / thermal / imx-thermal.txt

diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.txt b/Documentation/devicetree/bindings/thermal/imx-thermal.txt
index 541c25e49abfa6f09bf621ff3f78c92435dd68cd..1f0f67234a917bae606b17ad2432e45d7d171895 100644 (file)
--- a/Documentation/devicetree/bindings/thermal/imx-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/imx-thermal.txt
@@ -8,10 +8,14 @@ Required properties:
   calibration data, e.g. OCOTP on imx6q.  The details about calibration data
   can be found in SoC Reference Manual.
 
   calibration data, e.g. OCOTP on imx6q.  The details about calibration data
   can be found in SoC Reference Manual.
 

+Optional properties:
+- clocks : thermal sensor's clock source.
+

 Example:
 
 tempmon {
        compatible = "fsl,imx6q-tempmon";
        fsl,tempmon = <&anatop>;
        fsl,tempmon-data = <&ocotp>;
 Example:
 
 tempmon {
        compatible = "fsl,imx6q-tempmon";
        fsl,tempmon = <&anatop>;
        fsl,tempmon-data = <&ocotp>;

+       clocks = <&clks 172>;

 };
 };