aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2015-01-29 18:26:03 -0500
committerKukjin Kim <kgene@kernel.org>2015-02-26 15:24:54 -0500
commit9843a2236003e343b4c0674d49c2700d505c9287 (patch)
treebb524497e127834d1088289e2234e338036fd46a
parent6562504dfe4128608b417397b92d7fd943648535 (diff)
ARM: dts: Provide dt bindings identical for Exynos TMU
Presented device tree bindings provide data already hardcoded in the exynos_tmu_data.c file. After this commit, it should be possible to reuse common thermal core framework in Exynos SoCs. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Acked-by: Eduardo Valentin <edubezval@gmail.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
-rw-r--r--arch/arm/boot/dts/exynos3250.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4210.dtsi25
-rw-r--r--arch/arm/boot/dts/exynos4x12.dtsi1
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi9
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi28
-rw-r--r--arch/arm/boot/dts/exynos5440.dtsi18
7 files changed, 84 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 277b48b0b6f9..ac6b0ae42caf 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -18,6 +18,7 @@
18 */ 18 */
19 19
20#include "skeleton.dtsi" 20#include "skeleton.dtsi"
21#include "exynos4-cpu-thermal.dtsi"
21#include <dt-bindings/clock/exynos3250.h> 22#include <dt-bindings/clock/exynos3250.h>
22 23
23/ { 24/ {
@@ -193,6 +194,7 @@
193 interrupts = <0 216 0>; 194 interrupts = <0 216 0>;
194 clocks = <&cmu CLK_TMU_APBIF>; 195 clocks = <&cmu CLK_TMU_APBIF>;
195 clock-names = "tmu_apbif"; 196 clock-names = "tmu_apbif";
197 #include "exynos4412-tmu-sensor-conf.dtsi"
196 status = "disabled"; 198 status = "disabled";
197 }; 199 };
198 200
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 76173cacd450..27a71302ade3 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -663,6 +663,10 @@
663 status = "disabled"; 663 status = "disabled";
664 }; 664 };
665 665
666 tmu: tmu@100C0000 {
667 #include "exynos4412-tmu-sensor-conf.dtsi"
668 };
669
666 ppmu_dmc0: ppmu_dmc0@106a0000 { 670 ppmu_dmc0: ppmu_dmc0@106a0000 {
667 compatible = "samsung,exynos-ppmu"; 671 compatible = "samsung,exynos-ppmu";
668 reg = <0x106a0000 0x2000>; 672 reg = <0x106a0000 0x2000>;
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 66f6f95e0ab1..96f70f5095d6 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -21,6 +21,7 @@
21 21
22#include "exynos4.dtsi" 22#include "exynos4.dtsi"
23#include "exynos4210-pinctrl.dtsi" 23#include "exynos4210-pinctrl.dtsi"
24#include "exynos4-cpu-thermal.dtsi"
24 25
25/ { 26/ {
26 compatible = "samsung,exynos4210", "samsung,exynos4"; 27 compatible = "samsung,exynos4210", "samsung,exynos4";
@@ -156,16 +157,38 @@
156 reg = <0x03860000 0x1000>; 157 reg = <0x03860000 0x1000>;
157 }; 158 };
158 159
159 tmu@100C0000 { 160 tmu: tmu@100C0000 {
160 compatible = "samsung,exynos4210-tmu"; 161 compatible = "samsung,exynos4210-tmu";
161 interrupt-parent = <&combiner>; 162 interrupt-parent = <&combiner>;
162 reg = <0x100C0000 0x100>; 163 reg = <0x100C0000 0x100>;
163 interrupts = <2 4>; 164 interrupts = <2 4>;
164 clocks = <&clock CLK_TMU_APBIF>; 165 clocks = <&clock CLK_TMU_APBIF>;
165 clock-names = "tmu_apbif"; 166 clock-names = "tmu_apbif";
167 samsung,tmu_gain = <15>;
168 samsung,tmu_reference_voltage = <7>;
166 status = "disabled"; 169 status = "disabled";
167 }; 170 };
168 171
172 thermal-zones {
173 cpu_thermal: cpu-thermal {
174 polling-delay-passive = <0>;
175 polling-delay = <0>;
176 thermal-sensors = <&tmu 0>;
177
178 trips {
179 cpu_alert0: cpu-alert-0 {
180 temperature = <85000>; /* millicelsius */
181 };
182 cpu_alert1: cpu-alert-1 {
183 temperature = <100000>; /* millicelsius */
184 };
185 cpu_alert2: cpu-alert-2 {
186 temperature = <110000>; /* millicelsius */
187 };
188 };
189 };
190 };
191
169 g2d@12800000 { 192 g2d@12800000 {
170 compatible = "samsung,s5pv210-g2d"; 193 compatible = "samsung,s5pv210-g2d";
171 reg = <0x12800000 0x1000>; 194 reg = <0x12800000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index f5e0ae780d6c..31bdff24d200 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -19,6 +19,7 @@
19 19
20#include "exynos4.dtsi" 20#include "exynos4.dtsi"
21#include "exynos4x12-pinctrl.dtsi" 21#include "exynos4x12-pinctrl.dtsi"
22#include "exynos4-cpu-thermal.dtsi"
22 23
23/ { 24/ {
24 aliases { 25 aliases {
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 8496d184fca0..308346cf93ec 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -20,7 +20,7 @@
20#include <dt-bindings/clock/exynos5250.h> 20#include <dt-bindings/clock/exynos5250.h>
21#include "exynos5.dtsi" 21#include "exynos5.dtsi"
22#include "exynos5250-pinctrl.dtsi" 22#include "exynos5250-pinctrl.dtsi"
23 23#include "exynos4-cpu-thermal.dtsi"
24#include <dt-bindings/clock/exynos-audss-clk.h> 24#include <dt-bindings/clock/exynos-audss-clk.h>
25 25
26/ { 26/ {
@@ -238,16 +238,21 @@
238 status = "disabled"; 238 status = "disabled";
239 }; 239 };
240 240
241 tmu@10060000 { 241 tmu: tmu@10060000 {
242 compatible = "samsung,exynos5250-tmu"; 242 compatible = "samsung,exynos5250-tmu";
243 reg = <0x10060000 0x100>; 243 reg = <0x10060000 0x100>;
244 interrupts = <0 65 0>; 244 interrupts = <0 65 0>;
245 clocks = <&clock CLK_TMU>; 245 clocks = <&clock CLK_TMU>;
246 clock-names = "tmu_apbif"; 246 clock-names = "tmu_apbif";
247 #include "exynos4412-tmu-sensor-conf.dtsi"
247 }; 248 };
248 249
249 thermal-zones { 250 thermal-zones {
250 cpu_thermal: cpu-thermal { 251 cpu_thermal: cpu-thermal {
252 polling-delay-passive = <0>;
253 polling-delay = <0>;
254 thermal-sensors = <&tmu 0>;
255
251 cooling-maps { 256 cooling-maps {
252 map0 { 257 map0 {
253 /* Corresponds to 800MHz at freq_table */ 258 /* Corresponds to 800MHz at freq_table */
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 9dc2e9773b30..b031c3c9f1c7 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -782,6 +782,7 @@
782 interrupts = <0 65 0>; 782 interrupts = <0 65 0>;
783 clocks = <&clock CLK_TMU>; 783 clocks = <&clock CLK_TMU>;
784 clock-names = "tmu_apbif"; 784 clock-names = "tmu_apbif";
785 #include "exynos4412-tmu-sensor-conf.dtsi"
785 }; 786 };
786 787
787 tmu_cpu1: tmu@10064000 { 788 tmu_cpu1: tmu@10064000 {
@@ -790,6 +791,7 @@
790 interrupts = <0 183 0>; 791 interrupts = <0 183 0>;
791 clocks = <&clock CLK_TMU>; 792 clocks = <&clock CLK_TMU>;
792 clock-names = "tmu_apbif"; 793 clock-names = "tmu_apbif";
794 #include "exynos4412-tmu-sensor-conf.dtsi"
793 }; 795 };
794 796
795 tmu_cpu2: tmu@10068000 { 797 tmu_cpu2: tmu@10068000 {
@@ -798,6 +800,7 @@
798 interrupts = <0 184 0>; 800 interrupts = <0 184 0>;
799 clocks = <&clock CLK_TMU>, <&clock CLK_TMU>; 801 clocks = <&clock CLK_TMU>, <&clock CLK_TMU>;
800 clock-names = "tmu_apbif", "tmu_triminfo_apbif"; 802 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
803 #include "exynos4412-tmu-sensor-conf.dtsi"
801 }; 804 };
802 805
803 tmu_cpu3: tmu@1006c000 { 806 tmu_cpu3: tmu@1006c000 {
@@ -806,6 +809,7 @@
806 interrupts = <0 185 0>; 809 interrupts = <0 185 0>;
807 clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>; 810 clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>;
808 clock-names = "tmu_apbif", "tmu_triminfo_apbif"; 811 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
812 #include "exynos4412-tmu-sensor-conf.dtsi"
809 }; 813 };
810 814
811 tmu_gpu: tmu@100a0000 { 815 tmu_gpu: tmu@100a0000 {
@@ -814,6 +818,30 @@
814 interrupts = <0 215 0>; 818 interrupts = <0 215 0>;
815 clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>; 819 clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>;
816 clock-names = "tmu_apbif", "tmu_triminfo_apbif"; 820 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
821 #include "exynos4412-tmu-sensor-conf.dtsi"
822 };
823
824 thermal-zones {
825 cpu0_thermal: cpu0-thermal {
826 thermal-sensors = <&tmu_cpu0>;
827 #include "exynos5420-trip-points.dtsi"
828 };
829 cpu1_thermal: cpu1-thermal {
830 thermal-sensors = <&tmu_cpu1>;
831 #include "exynos5420-trip-points.dtsi"
832 };
833 cpu2_thermal: cpu2-thermal {
834 thermal-sensors = <&tmu_cpu2>;
835 #include "exynos5420-trip-points.dtsi"
836 };
837 cpu3_thermal: cpu3-thermal {
838 thermal-sensors = <&tmu_cpu3>;
839 #include "exynos5420-trip-points.dtsi"
840 };
841 gpu_thermal: gpu-thermal {
842 thermal-sensors = <&tmu_gpu>;
843 #include "exynos5420-trip-points.dtsi"
844 };
817 }; 845 };
818 846
819 watchdog: watchdog@101D0000 { 847 watchdog: watchdog@101D0000 {
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 8f3373cd7b87..59d9416b3b03 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -219,6 +219,7 @@
219 interrupts = <0 58 0>; 219 interrupts = <0 58 0>;
220 clocks = <&clock CLK_B_125>; 220 clocks = <&clock CLK_B_125>;
221 clock-names = "tmu_apbif"; 221 clock-names = "tmu_apbif";
222 #include "exynos5440-tmu-sensor-conf.dtsi"
222 }; 223 };
223 224
224 tmuctrl_1: tmuctrl@16011C { 225 tmuctrl_1: tmuctrl@16011C {
@@ -227,6 +228,7 @@
227 interrupts = <0 58 0>; 228 interrupts = <0 58 0>;
228 clocks = <&clock CLK_B_125>; 229 clocks = <&clock CLK_B_125>;
229 clock-names = "tmu_apbif"; 230 clock-names = "tmu_apbif";
231 #include "exynos5440-tmu-sensor-conf.dtsi"
230 }; 232 };
231 233
232 tmuctrl_2: tmuctrl@160120 { 234 tmuctrl_2: tmuctrl@160120 {
@@ -235,6 +237,22 @@
235 interrupts = <0 58 0>; 237 interrupts = <0 58 0>;
236 clocks = <&clock CLK_B_125>; 238 clocks = <&clock CLK_B_125>;
237 clock-names = "tmu_apbif"; 239 clock-names = "tmu_apbif";
240 #include "exynos5440-tmu-sensor-conf.dtsi"
241 };
242
243 thermal-zones {
244 cpu0_thermal: cpu0-thermal {
245 thermal-sensors = <&tmuctrl_0>;
246 #include "exynos5440-trip-points.dtsi"
247 };
248 cpu1_thermal: cpu1-thermal {
249 thermal-sensors = <&tmuctrl_1>;
250 #include "exynos5440-trip-points.dtsi"
251 };
252 cpu2_thermal: cpu2-thermal {
253 thermal-sensors = <&tmuctrl_2>;
254 #include "exynos5440-trip-points.dtsi"
255 };
238 }; 256 };
239 257
240 sata@210000 { 258 sata@210000 {