Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 33435ce79ce4c2c8611a458bd78efaa1837ca1c4..fddc661ded28f6664d4c7cb5c645fb83b7773876 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -102,6 +102,8 @@
                        reg = <0x10502000 0x1000>;
                        cache-unified;
                        cache-level = <2>;
+                       prefetch-data = <1>;
+                       prefetch-instr = <1>;
                        arm,tag-latency = <2 2 1>;
                        arm,data-latency = <2 2 1>;
                };
@@ -363,26 +365,24 @@
                        };
                };
        };
+};
 
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay-passive = <0>;
-                       polling-delay = <0>;
-                       thermal-sensors = <&tmu 0>;
-
-                       trips {
-                               cpu_alert0: cpu-alert-0 {
-                                       temperature = <85000>; /* millicelsius */
-                               };
-                               cpu_alert1: cpu-alert-1 {
-                                       temperature = <100000>; /* millicelsius */
-                               };
-                               cpu_alert2: cpu-alert-2 {
-                                       temperature = <110000>; /* millicelsius */
-                               };
-                       };
-               };
-       };
+&cpu_alert0 {
+       temperature = <85000>; /* millicelsius */
+};
+
+&cpu_alert1 {
+       temperature = <100000>; /* millicelsius */
+};
+
+&cpu_alert2 {
+       temperature = <110000>; /* millicelsius */
+};
+
+&cpu_thermal {
+       polling-delay-passive = <0>;
+       polling-delay = <0>;
+       thermal-sensors = <&tmu 0>;
 };
 
 &gic {