Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

[karo-tx-linux.git] / arch / arm / boot / dts / omap36xx-clocks.dtsi

diff --git a/arch/arm/boot/dts/omap36xx-clocks.dtsi b/arch/arm/boot/dts/omap36xx-clocks.dtsi
index 6b5280d04a0ed24baad6fa81a7f353f826f82c52..200ae3a5cbbb04254b8145c7aa16fa7cccd094ad 100644 (file)
--- a/arch/arm/boot/dts/omap36xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-clocks.dtsi
@@ -83,7 +83,7 @@
 };
 
 &dpll4_m5x2_mul_ck {
-       clock-mult = <1>;
+       ti,clock-mult = <1>;
 };
 
 &dpll4_m6x2_mul_ck {