Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sx.dtsi

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 32d71245b2a6214934458672266872853098d4eb..5b03ba3beda9e91d47d1bf7ad8e5ed25fc1f347d 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -675,7 +675,8 @@
                                compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                                fsl,tempmon = <&anatop>;
-                               fsl,tempmon-data = <&ocotp>;
+                               nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
+                               nvmem-cell-names = "calib", "temp_grade";
                                clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
                        };
 
@@ -994,9 +995,19 @@
                        };
 
                        ocotp: ocotp@21bc000 {
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                compatible = "fsl,imx6sx-ocotp", "syscon";
                                reg = <0x021bc000 0x4000>;
                                clocks = <&clks IMX6SX_CLK_OCOTP>;
+
+                               tempmon_calib: calib@38 {
+                                       reg = <0x38 4>;
+                               };
+
+                               tempmon_temp_grade: temp-grade@20 {
+                                       reg = <0x20 4>;
+                               };
                        };
 
                        sai1: sai@21d4000 {