Merge branch 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux

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

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 5d3a43b8de20704fe8d334366d063d7675821f34..c4f12fd2e044e44d325eca5776748288d04d0885 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -493,10 +493,9 @@
                        };
 
                        ocotp: ocotp-ctrl@30350000 {
-                               compatible = "syscon";
+                               compatible = "fsl,imx7d-ocotp", "syscon";
                                reg = <0x30350000 0x10000>;
-                               clocks = <&clks IMX7D_CLK_DUMMY>;
-                               status = "disabled";
+                               clocks = <&clks IMX7D_OCOTP_CLK>;
                        };
 
                        anatop: anatop@30360000 {
@@ -559,7 +558,7 @@
                        };
 
                        src: src@30390000 {
-                               compatible = "fsl,imx7d-src", "fsl,imx51-src", "syscon";
+                               compatible = "fsl,imx7d-src", "syscon";
                                reg = <0x30390000 0x10000>;
                                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                                #reset-cells = <1>;