Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4412-itop-scp-core.dtsi

diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
index ab7affab7f1c0e331fd00493701e833c82bd7ae6..0038465f38f19e217eb565d474f0bb87b0669a9b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
+++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
@@ -45,11 +45,15 @@
                        cooling-maps {
                                map0 {
                                     /* Corresponds to 800MHz at freq_table */
-                                    cooling-device = <&cpu0 7 7>;
+                                    cooling-device = <&cpu0 7 7>, <&cpu1 7 7>,
+                                                     <&cpu2 7 7>, <&cpu3 7 7>;
                                };
                                map1 {
                                     /* Corresponds to 200MHz at freq_table */
-                                    cooling-device = <&cpu0 13 13>;
+                                    cooling-device = <&cpu0 13 13>,
+                                                     <&cpu1 13 13>,
+                                                     <&cpu2 13 13>,
+                                                     <&cpu3 13 13>;
                               };
                       };
                };
@@ -446,6 +450,7 @@
                };
 
                s5m8767_osc: clocks {
+                       compatible = "samsung,s5m8767-clk";
                        #clock-cells = <1>;
                        clock-output-names = "s5m8767_ap",
                                        "s5m8767_cp", "s5m8767_bt";