aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-04-27 15:47:50 -0400
committerArnd Bergmann <arnd@arndb.de>2017-04-27 15:47:50 -0400
commitb9f34da74e1c4b5f2574333277cd8d8f53bad056 (patch)
treef7e355d1a54ade2eeb977a947a197f58f77051ba
parent6d14b5a0baa3f8e987a27762c60a2c7a7b31288c (diff)
parent6a611d149a9a1eff7c89e81bab018e4121cce17e (diff)
Merge tag 'samsung-dt-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Pull "Fix DTC warnings in Exynos ARMv7 Device Tree sources." from Krzysztof Kozłowski: * tag 'samsung-dt-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Use - instead of @ for DT OPP entries
Diffstat
-rw-r--r--Documentation/devicetree/bindings/devfreq/exynos-bus.txt46
-rw-r--r--arch/arm/boot/dts/exynos3250.dtsi46
-rw-r--r--arch/arm/boot/dts/exynos4210.dtsi32
-rw-r--r--arch/arm/boot/dts/exynos4412-prime.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4412.dtsi66
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi40
-rw-r--r--arch/arm/boot/dts/exynos5800.dtsi56
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi43
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2.dts17
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts18
10 files changed, 221 insertions, 147 deletions
diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
index d085ef90d27c..f8e946471a58 100644
--- a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+++ b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -202,23 +202,23 @@ Example2 :
202 compatible = "operating-points-v2"; 202 compatible = "operating-points-v2";
203 opp-shared; 203 opp-shared;
204 204
205 opp@50000000 { 205 opp-50000000 {
206 opp-hz = /bits/ 64 <50000000>; 206 opp-hz = /bits/ 64 <50000000>;
207 opp-microvolt = <800000>; 207 opp-microvolt = <800000>;
208 }; 208 };
209 opp@100000000 { 209 opp-100000000 {
210 opp-hz = /bits/ 64 <100000000>; 210 opp-hz = /bits/ 64 <100000000>;
211 opp-microvolt = <800000>; 211 opp-microvolt = <800000>;
212 }; 212 };
213 opp@134000000 { 213 opp-134000000 {
214 opp-hz = /bits/ 64 <134000000>; 214 opp-hz = /bits/ 64 <134000000>;
215 opp-microvolt = <800000>; 215 opp-microvolt = <800000>;
216 }; 216 };
217 opp@200000000 { 217 opp-200000000 {
218 opp-hz = /bits/ 64 <200000000>; 218 opp-hz = /bits/ 64 <200000000>;
219 opp-microvolt = <825000>; 219 opp-microvolt = <825000>;
220 }; 220 };
221 opp@400000000 { 221 opp-400000000 {
222 opp-hz = /bits/ 64 <400000000>; 222 opp-hz = /bits/ 64 <400000000>;
223 opp-microvolt = <875000>; 223 opp-microvolt = <875000>;
224 }; 224 };
@@ -292,23 +292,23 @@ Example2 :
292 compatible = "operating-points-v2"; 292 compatible = "operating-points-v2";
293 opp-shared; 293 opp-shared;
294 294
295 opp@50000000 { 295 opp-50000000 {
296 opp-hz = /bits/ 64 <50000000>; 296 opp-hz = /bits/ 64 <50000000>;
297 opp-microvolt = <900000>; 297 opp-microvolt = <900000>;
298 }; 298 };
299 opp@80000000 { 299 opp-80000000 {
300 opp-hz = /bits/ 64 <80000000>; 300 opp-hz = /bits/ 64 <80000000>;
301 opp-microvolt = <900000>; 301 opp-microvolt = <900000>;
302 }; 302 };
303 opp@100000000 { 303 opp-100000000 {
304 opp-hz = /bits/ 64 <100000000>; 304 opp-hz = /bits/ 64 <100000000>;
305 opp-microvolt = <1000000>; 305 opp-microvolt = <1000000>;
306 }; 306 };
307 opp@134000000 { 307 opp-134000000 {
308 opp-hz = /bits/ 64 <134000000>; 308 opp-hz = /bits/ 64 <134000000>;
309 opp-microvolt = <1000000>; 309 opp-microvolt = <1000000>;
310 }; 310 };
311 opp@200000000 { 311 opp-200000000 {
312 opp-hz = /bits/ 64 <200000000>; 312 opp-hz = /bits/ 64 <200000000>;
313 opp-microvolt = <1000000>; 313 opp-microvolt = <1000000>;
314 }; 314 };
@@ -318,19 +318,19 @@ Example2 :
318 compatible = "operating-points-v2"; 318 compatible = "operating-points-v2";
319 opp-shared; 319 opp-shared;
320 320
321 opp@50000000 { 321 opp-50000000 {
322 opp-hz = /bits/ 64 <50000000>; 322 opp-hz = /bits/ 64 <50000000>;
323 }; 323 };
324 opp@80000000 { 324 opp-80000000 {
325 opp-hz = /bits/ 64 <80000000>; 325 opp-hz = /bits/ 64 <80000000>;
326 }; 326 };
327 opp@100000000 { 327 opp-100000000 {
328 opp-hz = /bits/ 64 <100000000>; 328 opp-hz = /bits/ 64 <100000000>;
329 }; 329 };
330 opp@200000000 { 330 opp-200000000 {
331 opp-hz = /bits/ 64 <200000000>; 331 opp-hz = /bits/ 64 <200000000>;
332 }; 332 };
333 opp@400000000 { 333 opp-400000000 {
334 opp-hz = /bits/ 64 <400000000>; 334 opp-hz = /bits/ 64 <400000000>;
335 }; 335 };
336 }; 336 };
@@ -339,19 +339,19 @@ Example2 :
339 compatible = "operating-points-v2"; 339 compatible = "operating-points-v2";
340 opp-shared; 340 opp-shared;
341 341
342 opp@50000000 { 342 opp-50000000 {
343 opp-hz = /bits/ 64 <50000000>; 343 opp-hz = /bits/ 64 <50000000>;
344 }; 344 };
345 opp@80000000 { 345 opp-80000000 {
346 opp-hz = /bits/ 64 <80000000>; 346 opp-hz = /bits/ 64 <80000000>;
347 }; 347 };
348 opp@100000000 { 348 opp-100000000 {
349 opp-hz = /bits/ 64 <100000000>; 349 opp-hz = /bits/ 64 <100000000>;
350 }; 350 };
351 opp@200000000 { 351 opp-200000000 {
352 opp-hz = /bits/ 64 <200000000>; 352 opp-hz = /bits/ 64 <200000000>;
353 }; 353 };
354 opp@300000000 { 354 opp-300000000 {
355 opp-hz = /bits/ 64 <300000000>; 355 opp-hz = /bits/ 64 <300000000>;
356 }; 356 };
357 }; 357 };
@@ -360,13 +360,13 @@ Example2 :
360 compatible = "operating-points-v2"; 360 compatible = "operating-points-v2";
361 opp-shared; 361 opp-shared;
362 362
363 opp@50000000 { 363 opp-50000000 {
364 opp-hz = /bits/ 64 <50000000>; 364 opp-hz = /bits/ 64 <50000000>;
365 }; 365 };
366 opp@80000000 { 366 opp-80000000 {
367 opp-hz = /bits/ 64 <80000000>; 367 opp-hz = /bits/ 64 <80000000>;
368 }; 368 };
369 opp@100000000 { 369 opp-100000000 {
370 opp-hz = /bits/ 64 <100000000>; 370 opp-hz = /bits/ 64 <100000000>;
371 }; 371 };
372 }; 372 };
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 9c28ef4508e0..590ee442d0ae 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -745,23 +745,23 @@
745 compatible = "operating-points-v2"; 745 compatible = "operating-points-v2";
746 opp-shared; 746 opp-shared;
747 747
748 opp@50000000 { 748 opp-50000000 {
749 opp-hz = /bits/ 64 <50000000>; 749 opp-hz = /bits/ 64 <50000000>;
750 opp-microvolt = <800000>; 750 opp-microvolt = <800000>;
751 }; 751 };
752 opp@100000000 { 752 opp-100000000 {
753 opp-hz = /bits/ 64 <100000000>; 753 opp-hz = /bits/ 64 <100000000>;
754 opp-microvolt = <800000>; 754 opp-microvolt = <800000>;
755 }; 755 };
756 opp@134000000 { 756 opp-134000000 {
757 opp-hz = /bits/ 64 <134000000>; 757 opp-hz = /bits/ 64 <134000000>;
758 opp-microvolt = <800000>; 758 opp-microvolt = <800000>;
759 }; 759 };
760 opp@200000000 { 760 opp-200000000 {
761 opp-hz = /bits/ 64 <200000000>; 761 opp-hz = /bits/ 64 <200000000>;
762 opp-microvolt = <825000>; 762 opp-microvolt = <825000>;
763 }; 763 };
764 opp@400000000 { 764 opp-400000000 {
765 opp-hz = /bits/ 64 <400000000>; 765 opp-hz = /bits/ 64 <400000000>;
766 opp-microvolt = <875000>; 766 opp-microvolt = <875000>;
767 }; 767 };
@@ -835,23 +835,23 @@
835 compatible = "operating-points-v2"; 835 compatible = "operating-points-v2";
836 opp-shared; 836 opp-shared;
837 837
838 opp@50000000 { 838 opp-50000000 {
839 opp-hz = /bits/ 64 <50000000>; 839 opp-hz = /bits/ 64 <50000000>;
840 opp-microvolt = <900000>; 840 opp-microvolt = <900000>;
841 }; 841 };
842 opp@80000000 { 842 opp-80000000 {
843 opp-hz = /bits/ 64 <80000000>; 843 opp-hz = /bits/ 64 <80000000>;
844 opp-microvolt = <900000>; 844 opp-microvolt = <900000>;
845 }; 845 };
846 opp@100000000 { 846 opp-100000000 {
847 opp-hz = /bits/ 64 <100000000>; 847 opp-hz = /bits/ 64 <100000000>;
848 opp-microvolt = <1000000>; 848 opp-microvolt = <1000000>;
849 }; 849 };
850 opp@134000000 { 850 opp-134000000 {
851 opp-hz = /bits/ 64 <134000000>; 851 opp-hz = /bits/ 64 <134000000>;
852 opp-microvolt = <1000000>; 852 opp-microvolt = <1000000>;
853 }; 853 };
854 opp@200000000 { 854 opp-200000000 {
855 opp-hz = /bits/ 64 <200000000>; 855 opp-hz = /bits/ 64 <200000000>;
856 opp-microvolt = <1000000>; 856 opp-microvolt = <1000000>;
857 }; 857 };
@@ -861,19 +861,19 @@
861 compatible = "operating-points-v2"; 861 compatible = "operating-points-v2";
862 opp-shared; 862 opp-shared;
863 863
864 opp@50000000 { 864 opp-50000000 {
865 opp-hz = /bits/ 64 <50000000>; 865 opp-hz = /bits/ 64 <50000000>;
866 }; 866 };
867 opp@80000000 { 867 opp-80000000 {
868 opp-hz = /bits/ 64 <80000000>; 868 opp-hz = /bits/ 64 <80000000>;
869 }; 869 };
870 opp@100000000 { 870 opp-100000000 {
871 opp-hz = /bits/ 64 <100000000>; 871 opp-hz = /bits/ 64 <100000000>;
872 }; 872 };
873 opp@200000000 { 873 opp-200000000 {
874 opp-hz = /bits/ 64 <200000000>; 874 opp-hz = /bits/ 64 <200000000>;
875 }; 875 };
876 opp@400000000 { 876 opp-400000000 {
877 opp-hz = /bits/ 64 <400000000>; 877 opp-hz = /bits/ 64 <400000000>;
878 }; 878 };
879 }; 879 };
@@ -882,19 +882,19 @@
882 compatible = "operating-points-v2"; 882 compatible = "operating-points-v2";
883 opp-shared; 883 opp-shared;
884 884
885 opp@50000000 { 885 opp-50000000 {
886 opp-hz = /bits/ 64 <50000000>; 886 opp-hz = /bits/ 64 <50000000>;
887 }; 887 };
888 opp@80000000 { 888 opp-80000000 {
889 opp-hz = /bits/ 64 <80000000>; 889 opp-hz = /bits/ 64 <80000000>;
890 }; 890 };
891 opp@100000000 { 891 opp-100000000 {
892 opp-hz = /bits/ 64 <100000000>; 892 opp-hz = /bits/ 64 <100000000>;
893 }; 893 };
894 opp@200000000 { 894 opp-200000000 {
895 opp-hz = /bits/ 64 <200000000>; 895 opp-hz = /bits/ 64 <200000000>;
896 }; 896 };
897 opp@300000000 { 897 opp-300000000 {
898 opp-hz = /bits/ 64 <300000000>; 898 opp-hz = /bits/ 64 <300000000>;
899 }; 899 };
900 }; 900 };
@@ -903,13 +903,13 @@
903 compatible = "operating-points-v2"; 903 compatible = "operating-points-v2";
904 opp-shared; 904 opp-shared;
905 905
906 opp@50000000 { 906 opp-50000000 {
907 opp-hz = /bits/ 64 <50000000>; 907 opp-hz = /bits/ 64 <50000000>;
908 }; 908 };
909 opp@80000000 { 909 opp-80000000 {
910 opp-hz = /bits/ 64 <80000000>; 910 opp-hz = /bits/ 64 <80000000>;
911 }; 911 };
912 opp@100000000 { 912 opp-100000000 {
913 opp-hz = /bits/ 64 <100000000>; 913 opp-hz = /bits/ 64 <100000000>;
914 }; 914 };
915 }; 915 };
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index e6e62103a71f..768fb075b1fd 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -343,15 +343,15 @@
343 compatible = "operating-points-v2"; 343 compatible = "operating-points-v2";
344 opp-shared; 344 opp-shared;
345 345
346 opp@134000000 { 346 opp-134000000 {
347 opp-hz = /bits/ 64 <134000000>; 347 opp-hz = /bits/ 64 <134000000>;
348 opp-microvolt = <1025000>; 348 opp-microvolt = <1025000>;
349 }; 349 };
350 opp@267000000 { 350 opp-267000000 {
351 opp-hz = /bits/ 64 <267000000>; 351 opp-hz = /bits/ 64 <267000000>;
352 opp-microvolt = <1050000>; 352 opp-microvolt = <1050000>;
353 }; 353 };
354 opp@400000000 { 354 opp-400000000 {
355 opp-hz = /bits/ 64 <400000000>; 355 opp-hz = /bits/ 64 <400000000>;
356 opp-microvolt = <1150000>; 356 opp-microvolt = <1150000>;
357 }; 357 };
@@ -361,13 +361,13 @@
361 compatible = "operating-points-v2"; 361 compatible = "operating-points-v2";
362 opp-shared; 362 opp-shared;
363 363
364 opp@134000000 { 364 opp-134000000 {
365 opp-hz = /bits/ 64 <134000000>; 365 opp-hz = /bits/ 64 <134000000>;
366 }; 366 };
367 opp@160000000 { 367 opp-160000000 {
368 opp-hz = /bits/ 64 <160000000>; 368 opp-hz = /bits/ 64 <160000000>;
369 }; 369 };
370 opp@200000000 { 370 opp-200000000 {
371 opp-hz = /bits/ 64 <200000000>; 371 opp-hz = /bits/ 64 <200000000>;
372 }; 372 };
373 }; 373 };
@@ -376,10 +376,10 @@
376 compatible = "operating-points-v2"; 376 compatible = "operating-points-v2";
377 opp-shared; 377 opp-shared;
378 378
379 opp@5000000 { 379 opp-5000000 {
380 opp-hz = /bits/ 64 <5000000>; 380 opp-hz = /bits/ 64 <5000000>;
381 }; 381 };
382 opp@100000000 { 382 opp-100000000 {
383 opp-hz = /bits/ 64 <100000000>; 383 opp-hz = /bits/ 64 <100000000>;
384 }; 384 };
385 }; 385 };
@@ -388,10 +388,10 @@
388 compatible = "operating-points-v2"; 388 compatible = "operating-points-v2";
389 opp-shared; 389 opp-shared;
390 390
391 opp@10000000 { 391 opp-10000000 {
392 opp-hz = /bits/ 64 <10000000>; 392 opp-hz = /bits/ 64 <10000000>;
393 }; 393 };
394 opp@134000000 { 394 opp-134000000 {
395 opp-hz = /bits/ 64 <134000000>; 395 opp-hz = /bits/ 64 <134000000>;
396 }; 396 };
397 }; 397 };
@@ -400,13 +400,13 @@
400 compatible = "operating-points-v2"; 400 compatible = "operating-points-v2";
401 opp-shared; 401 opp-shared;
402 402
403 opp@100000000 { 403 opp-100000000 {
404 opp-hz = /bits/ 64 <100000000>; 404 opp-hz = /bits/ 64 <100000000>;
405 }; 405 };
406 opp@134000000 { 406 opp-134000000 {
407 opp-hz = /bits/ 64 <134000000>; 407 opp-hz = /bits/ 64 <134000000>;
408 }; 408 };
409 opp@160000000 { 409 opp-160000000 {
410 opp-hz = /bits/ 64 <160000000>; 410 opp-hz = /bits/ 64 <160000000>;
411 }; 411 };
412 }; 412 };
@@ -415,13 +415,13 @@
415 compatible = "operating-points-v2"; 415 compatible = "operating-points-v2";
416 opp-shared; 416 opp-shared;
417 417
418 opp@100000000 { 418 opp-100000000 {
419 opp-hz = /bits/ 64 <100000000>; 419 opp-hz = /bits/ 64 <100000000>;
420 }; 420 };
421 opp@160000000 { 421 opp-160000000 {
422 opp-hz = /bits/ 64 <160000000>; 422 opp-hz = /bits/ 64 <160000000>;
423 }; 423 };
424 opp@200000000 { 424 opp-200000000 {
425 opp-hz = /bits/ 64 <200000000>; 425 opp-hz = /bits/ 64 <200000000>;
426 }; 426 };
427 }; 427 };
diff --git a/arch/arm/boot/dts/exynos4412-prime.dtsi b/arch/arm/boot/dts/exynos4412-prime.dtsi
index e75bc170c89c..a67bd953d754 100644
--- a/arch/arm/boot/dts/exynos4412-prime.dtsi
+++ b/arch/arm/boot/dts/exynos4412-prime.dtsi
@@ -20,12 +20,12 @@
20}; 20};
21 21
22&cpu0_opp_table { 22&cpu0_opp_table {
23 opp@1600000000 { 23 opp-1600000000 {
24 opp-hz = /bits/ 64 <1600000000>; 24 opp-hz = /bits/ 64 <1600000000>;
25 opp-microvolt = <1350000>; 25 opp-microvolt = <1350000>;
26 clock-latency-ns = <200000>; 26 clock-latency-ns = <200000>;
27 }; 27 };
28 opp@1704000000 { 28 opp-1704000000 {
29 opp-hz = /bits/ 64 <1704000000>; 29 opp-hz = /bits/ 64 <1704000000>;
30 opp-microvolt = <1350000>; 30 opp-microvolt = <1350000>;
31 clock-latency-ns = <200000>; 31 clock-latency-ns = <200000>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index cc69466f17c0..7ff03a7e8fb9 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -76,73 +76,73 @@
76 compatible = "operating-points-v2"; 76 compatible = "operating-points-v2";
77 opp-shared; 77 opp-shared;
78 78
79 opp@200000000 { 79 opp-200000000 {
80 opp-hz = /bits/ 64 <200000000>; 80 opp-hz = /bits/ 64 <200000000>;
81 opp-microvolt = <900000>; 81 opp-microvolt = <900000>;
82 clock-latency-ns = <200000>; 82 clock-latency-ns = <200000>;
83 }; 83 };
84 opp@300000000 { 84 opp-300000000 {
85 opp-hz = /bits/ 64 <300000000>; 85 opp-hz = /bits/ 64 <300000000>;
86 opp-microvolt = <900000>; 86 opp-microvolt = <900000>;
87 clock-latency-ns = <200000>; 87 clock-latency-ns = <200000>;
88 }; 88 };
89 opp@400000000 { 89 opp-400000000 {
90 opp-hz = /bits/ 64 <400000000>; 90 opp-hz = /bits/ 64 <400000000>;
91 opp-microvolt = <925000>; 91 opp-microvolt = <925000>;
92 clock-latency-ns = <200000>; 92 clock-latency-ns = <200000>;
93 }; 93 };
94 opp@500000000 { 94 opp-500000000 {
95 opp-hz = /bits/ 64 <500000000>; 95 opp-hz = /bits/ 64 <500000000>;
96 opp-microvolt = <950000>; 96 opp-microvolt = <950000>;
97 clock-latency-ns = <200000>; 97 clock-latency-ns = <200000>;
98 }; 98 };
99 opp@600000000 { 99 opp-600000000 {
100 opp-hz = /bits/ 64 <600000000>; 100 opp-hz = /bits/ 64 <600000000>;
101 opp-microvolt = <975000>; 101 opp-microvolt = <975000>;
102 clock-latency-ns = <200000>; 102 clock-latency-ns = <200000>;
103 }; 103 };
104 opp@700000000 { 104 opp-700000000 {
105 opp-hz = /bits/ 64 <700000000>; 105 opp-hz = /bits/ 64 <700000000>;
106 opp-microvolt = <987500>; 106 opp-microvolt = <987500>;
107 clock-latency-ns = <200000>; 107 clock-latency-ns = <200000>;
108 }; 108 };
109 opp@800000000 { 109 opp-800000000 {
110 opp-hz = /bits/ 64 <800000000>; 110 opp-hz = /bits/ 64 <800000000>;
111 opp-microvolt = <1000000>; 111 opp-microvolt = <1000000>;
112 clock-latency-ns = <200000>; 112 clock-latency-ns = <200000>;
113 opp-suspend; 113 opp-suspend;
114 }; 114 };
115 opp@900000000 { 115 opp-900000000 {
116 opp-hz = /bits/ 64 <900000000>; 116 opp-hz = /bits/ 64 <900000000>;
117 opp-microvolt = <1037500>; 117 opp-microvolt = <1037500>;
118 clock-latency-ns = <200000>; 118 clock-latency-ns = <200000>;
119 }; 119 };
120 opp@1000000000 { 120 opp-1000000000 {
121 opp-hz = /bits/ 64 <1000000000>; 121 opp-hz = /bits/ 64 <1000000000>;
122 opp-microvolt = <1087500>; 122 opp-microvolt = <1087500>;
123 clock-latency-ns = <200000>; 123 clock-latency-ns = <200000>;
124 }; 124 };
125 opp@1100000000 { 125 opp-1100000000 {
126 opp-hz = /bits/ 64 <1100000000>; 126 opp-hz = /bits/ 64 <1100000000>;
127 opp-microvolt = <1137500>; 127 opp-microvolt = <1137500>;
128 clock-latency-ns = <200000>; 128 clock-latency-ns = <200000>;
129 }; 129 };
130 opp@1200000000 { 130 opp-1200000000 {
131 opp-hz = /bits/ 64 <1200000000>; 131 opp-hz = /bits/ 64 <1200000000>;
132 opp-microvolt = <1187500>; 132 opp-microvolt = <1187500>;
133 clock-latency-ns = <200000>; 133 clock-latency-ns = <200000>;
134 }; 134 };
135 opp@1300000000 { 135 opp-1300000000 {
136 opp-hz = /bits/ 64 <1300000000>; 136 opp-hz = /bits/ 64 <1300000000>;
137 opp-microvolt = <1250000>; 137 opp-microvolt = <1250000>;
138 clock-latency-ns = <200000>; 138 clock-latency-ns = <200000>;
139 }; 139 };
140 opp@1400000000 { 140 opp-1400000000 {
141 opp-hz = /bits/ 64 <1400000000>; 141 opp-hz = /bits/ 64 <1400000000>;
142 opp-microvolt = <1287500>; 142 opp-microvolt = <1287500>;
143 clock-latency-ns = <200000>; 143 clock-latency-ns = <200000>;
144 }; 144 };
145 cpu0_opp_1500: opp@1500000000 { 145 cpu0_opp_1500: opp-1500000000 {
146 opp-hz = /bits/ 64 <1500000000>; 146 opp-hz = /bits/ 64 <1500000000>;
147 opp-microvolt = <1350000>; 147 opp-microvolt = <1350000>;
148 clock-latency-ns = <200000>; 148 clock-latency-ns = <200000>;
@@ -442,23 +442,23 @@
442 compatible = "operating-points-v2"; 442 compatible = "operating-points-v2";
443 opp-shared; 443 opp-shared;
444 444
445 opp@100000000 { 445 opp-100000000 {
446 opp-hz = /bits/ 64 <100000000>; 446 opp-hz = /bits/ 64 <100000000>;
447 opp-microvolt = <900000>; 447 opp-microvolt = <900000>;
448 }; 448 };
449 opp@134000000 { 449 opp-134000000 {
450 opp-hz = /bits/ 64 <134000000>; 450 opp-hz = /bits/ 64 <134000000>;
451 opp-microvolt = <900000>; 451 opp-microvolt = <900000>;
452 }; 452 };
453 opp@160000000 { 453 opp-160000000 {
454 opp-hz = /bits/ 64 <160000000>; 454 opp-hz = /bits/ 64 <160000000>;
455 opp-microvolt = <900000>; 455 opp-microvolt = <900000>;
456 }; 456 };
457 opp@267000000 { 457 opp-267000000 {
458 opp-hz = /bits/ 64 <267000000>; 458 opp-hz = /bits/ 64 <267000000>;
459 opp-microvolt = <950000>; 459 opp-microvolt = <950000>;
460 }; 460 };
461 opp@400000000 { 461 opp-400000000 {
462 opp-hz = /bits/ 64 <400000000>; 462 opp-hz = /bits/ 64 <400000000>;
463 opp-microvolt = <1050000>; 463 opp-microvolt = <1050000>;
464 }; 464 };
@@ -468,16 +468,16 @@
468 compatible = "operating-points-v2"; 468 compatible = "operating-points-v2";
469 opp-shared; 469 opp-shared;
470 470
471 opp@100000000 { 471 opp-100000000 {
472 opp-hz = /bits/ 64 <100000000>; 472 opp-hz = /bits/ 64 <100000000>;
473 }; 473 };
474 opp@134000000 { 474 opp-134000000 {
475 opp-hz = /bits/ 64 <134000000>; 475 opp-hz = /bits/ 64 <134000000>;
476 }; 476 };
477 opp@160000000 { 477 opp-160000000 {
478 opp-hz = /bits/ 64 <160000000>; 478 opp-hz = /bits/ 64 <160000000>;
479 }; 479 };
480 opp@267000000 { 480 opp-267000000 {
481 opp-hz = /bits/ 64 <267000000>; 481 opp-hz = /bits/ 64 <267000000>;
482 }; 482 };
483 }; 483 };
@@ -534,19 +534,19 @@
534 compatible = "operating-points-v2"; 534 compatible = "operating-points-v2";
535 opp-shared; 535 opp-shared;
536 536
537 opp@100000000 { 537 opp-100000000 {
538 opp-hz = /bits/ 64 <100000000>; 538 opp-hz = /bits/ 64 <100000000>;
539 opp-microvolt = <900000>; 539 opp-microvolt = <900000>;
540 }; 540 };
541 opp@134000000 { 541 opp-134000000 {
542 opp-hz = /bits/ 64 <134000000>; 542 opp-hz = /bits/ 64 <134000000>;
543 opp-microvolt = <925000>; 543 opp-microvolt = <925000>;
544 }; 544 };
545 opp@160000000 { 545 opp-160000000 {
546 opp-hz = /bits/ 64 <160000000>; 546 opp-hz = /bits/ 64 <160000000>;
547 opp-microvolt = <950000>; 547 opp-microvolt = <950000>;
548 }; 548 };
549 opp@200000000 { 549 opp-200000000 {
550 opp-hz = /bits/ 64 <200000000>; 550 opp-hz = /bits/ 64 <200000000>;
551 opp-microvolt = <1000000>; 551 opp-microvolt = <1000000>;
552 }; 552 };
@@ -556,10 +556,10 @@
556 compatible = "operating-points-v2"; 556 compatible = "operating-points-v2";
557 opp-shared; 557 opp-shared;
558 558
559 opp@160000000 { 559 opp-160000000 {
560 opp-hz = /bits/ 64 <160000000>; 560 opp-hz = /bits/ 64 <160000000>;
561 }; 561 };
562 opp@200000000 { 562 opp-200000000 {
563 opp-hz = /bits/ 64 <200000000>; 563 opp-hz = /bits/ 64 <200000000>;
564 }; 564 };
565 }; 565 };
@@ -568,10 +568,10 @@
568 compatible = "operating-points-v2"; 568 compatible = "operating-points-v2";
569 opp-shared; 569 opp-shared;
570 570
571 opp@100000000 { 571 opp-100000000 {
572 opp-hz = /bits/ 64 <100000000>; 572 opp-hz = /bits/ 64 <100000000>;
573 }; 573 };
574 opp@134000000 { 574 opp-134000000 {
575 opp-hz = /bits/ 64 <134000000>; 575 opp-hz = /bits/ 64 <134000000>;
576 }; 576 };
577 }; 577 };
@@ -580,10 +580,10 @@
580 compatible = "operating-points-v2"; 580 compatible = "operating-points-v2";
581 opp-shared; 581 opp-shared;
582 582
583 opp@50000000 { 583 opp-50000000 {
584 opp-hz = /bits/ 64 <50000000>; 584 opp-hz = /bits/ 64 <50000000>;
585 }; 585 };
586 opp@100000000 { 586 opp-100000000 {
587 opp-hz = /bits/ 64 <100000000>; 587 opp-hz = /bits/ 64 <100000000>;
588 }; 588 };
589 }; 589 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 83b3899d228d..0db0bcf8da36 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -49,62 +49,62 @@
49 cluster_a15_opp_table: opp_table0 { 49 cluster_a15_opp_table: opp_table0 {
50 compatible = "operating-points-v2"; 50 compatible = "operating-points-v2";
51 opp-shared; 51 opp-shared;
52 opp@1800000000 { 52 opp-1800000000 {
53 opp-hz = /bits/ 64 <1800000000>; 53 opp-hz = /bits/ 64 <1800000000>;
54 opp-microvolt = <1250000>; 54 opp-microvolt = <1250000>;
55 clock-latency-ns = <140000>; 55 clock-latency-ns = <140000>;
56 }; 56 };
57 opp@1700000000 { 57 opp-1700000000 {
58 opp-hz = /bits/ 64 <1700000000>; 58 opp-hz = /bits/ 64 <1700000000>;
59 opp-microvolt = <1212500>; 59 opp-microvolt = <1212500>;
60 clock-latency-ns = <140000>; 60 clock-latency-ns = <140000>;
61 }; 61 };
62 opp@1600000000 { 62 opp-1600000000 {
63 opp-hz = /bits/ 64 <1600000000>; 63 opp-hz = /bits/ 64 <1600000000>;
64 opp-microvolt = <1175000>; 64 opp-microvolt = <1175000>;
65 clock-latency-ns = <140000>; 65 clock-latency-ns = <140000>;
66 }; 66 };
67 opp@1500000000 { 67 opp-1500000000 {
68 opp-hz = /bits/ 64 <1500000000>; 68 opp-hz = /bits/ 64 <1500000000>;
69 opp-microvolt = <1137500>; 69 opp-microvolt = <1137500>;
70 clock-latency-ns = <140000>; 70 clock-latency-ns = <140000>;
71 }; 71 };
72 opp@1400000000 { 72 opp-1400000000 {
73 opp-hz = /bits/ 64 <1400000000>; 73 opp-hz = /bits/ 64 <1400000000>;
74 opp-microvolt = <1112500>; 74 opp-microvolt = <1112500>;
75 clock-latency-ns = <140000>; 75 clock-latency-ns = <140000>;
76 }; 76 };
77 opp@1300000000 { 77 opp-1300000000 {
78 opp-hz = /bits/ 64 <1300000000>; 78 opp-hz = /bits/ 64 <1300000000>;
79 opp-microvolt = <1062500>; 79 opp-microvolt = <1062500>;
80 clock-latency-ns = <140000>; 80 clock-latency-ns = <140000>;
81 }; 81 };
82 opp@1200000000 { 82 opp-1200000000 {
83 opp-hz = /bits/ 64 <1200000000>; 83 opp-hz = /bits/ 64 <1200000000>;
84 opp-microvolt = <1037500>; 84 opp-microvolt = <1037500>;
85 clock-latency-ns = <140000>; 85 clock-latency-ns = <140000>;
86 }; 86 };
87 opp@1100000000 { 87 opp-1100000000 {
88 opp-hz = /bits/ 64 <1100000000>; 88 opp-hz = /bits/ 64 <1100000000>;
89 opp-microvolt = <1012500>; 89 opp-microvolt = <1012500>;
90 clock-latency-ns = <140000>; 90 clock-latency-ns = <140000>;
91 }; 91 };
92 opp@1000000000 { 92 opp-1000000000 {
93 opp-hz = /bits/ 64 <1000000000>; 93 opp-hz = /bits/ 64 <1000000000>;
94 opp-microvolt = < 987500>; 94 opp-microvolt = < 987500>;
95 clock-latency-ns = <140000>; 95 clock-latency-ns = <140000>;
96 }; 96 };
97 opp@900000000 { 97 opp-900000000 {
98 opp-hz = /bits/ 64 <900000000>; 98 opp-hz = /bits/ 64 <900000000>;
99 opp-microvolt = < 962500>; 99 opp-microvolt = < 962500>;
100 clock-latency-ns = <140000>; 100 clock-latency-ns = <140000>;
101 }; 101 };
102 opp@800000000 { 102 opp-800000000 {
103 opp-hz = /bits/ 64 <800000000>; 103 opp-hz = /bits/ 64 <800000000>;
104 opp-microvolt = < 937500>; 104 opp-microvolt = < 937500>;
105 clock-latency-ns = <140000>; 105 clock-latency-ns = <140000>;
106 }; 106 };
107 opp@700000000 { 107 opp-700000000 {
108 opp-hz = /bits/ 64 <700000000>; 108 opp-hz = /bits/ 64 <700000000>;
109 opp-microvolt = < 912500>; 109 opp-microvolt = < 912500>;
110 clock-latency-ns = <140000>; 110 clock-latency-ns = <140000>;
@@ -114,42 +114,42 @@
114 cluster_a7_opp_table: opp_table1 { 114 cluster_a7_opp_table: opp_table1 {
115 compatible = "operating-points-v2"; 115 compatible = "operating-points-v2";
116 opp-shared; 116 opp-shared;
117 opp@1300000000 { 117 opp-1300000000 {
118 opp-hz = /bits/ 64 <1300000000>; 118 opp-hz = /bits/ 64 <1300000000>;
119 opp-microvolt = <1275000>; 119 opp-microvolt = <1275000>;
120 clock-latency-ns = <140000>; 120 clock-latency-ns = <140000>;
121 }; 121 };
122 opp@1200000000 { 122 opp-1200000000 {
123 opp-hz = /bits/ 64 <1200000000>; 123 opp-hz = /bits/ 64 <1200000000>;
124 opp-microvolt = <1212500>; 124 opp-microvolt = <1212500>;
125 clock-latency-ns = <140000>; 125 clock-latency-ns = <140000>;
126 }; 126 };
127 opp@1100000000 { 127 opp-1100000000 {
128 opp-hz = /bits/ 64 <1100000000>; 128 opp-hz = /bits/ 64 <1100000000>;
129 opp-microvolt = <1162500>; 129 opp-microvolt = <1162500>;
130 clock-latency-ns = <140000>; 130 clock-latency-ns = <140000>;
131 }; 131 };
132 opp@1000000000 { 132 opp-1000000000 {
133 opp-hz = /bits/ 64 <1000000000>; 133 opp-hz = /bits/ 64 <1000000000>;
134 opp-microvolt = <1112500>; 134 opp-microvolt = <1112500>;
135 clock-latency-ns = <140000>; 135 clock-latency-ns = <140000>;
136 }; 136 };
137 opp@900000000 { 137 opp-900000000 {
138 opp-hz = /bits/ 64 <900000000>; 138 opp-hz = /bits/ 64 <900000000>;
139 opp-microvolt = <1062500>; 139 opp-microvolt = <1062500>;
140 clock-latency-ns = <140000>; 140 clock-latency-ns = <140000>;
141 }; 141 };
142 opp@800000000 { 142 opp-800000000 {
143 opp-hz = /bits/ 64 <800000000>; 143 opp-hz = /bits/ 64 <800000000>;
144 opp-microvolt = <1025000>; 144 opp-microvolt = <1025000>;
145 clock-latency-ns = <140000>; 145 clock-latency-ns = <140000>;
146 }; 146 };
147 opp@700000000 { 147 opp-700000000 {
148 opp-hz = /bits/ 64 <700000000>; 148 opp-hz = /bits/ 64 <700000000>;
149 opp-microvolt = <975000>; 149 opp-microvolt = <975000>;
150 clock-latency-ns = <140000>; 150 clock-latency-ns = <140000>;
151 }; 151 };
152 opp@600000000 { 152 opp-600000000 {
153 opp-hz = /bits/ 64 <600000000>; 153 opp-hz = /bits/ 64 <600000000>;
154 opp-microvolt = <937500>; 154 opp-microvolt = <937500>;
155 clock-latency-ns = <140000>; 155 clock-latency-ns = <140000>;
diff --git a/arch/arm/boot/dts/exynos5800.dtsi b/arch/arm/boot/dts/exynos5800.dtsi
index 8213016803e5..9ddb6bacac5a 100644
--- a/arch/arm/boot/dts/exynos5800.dtsi
+++ b/arch/arm/boot/dts/exynos5800.dtsi
@@ -24,60 +24,60 @@
24}; 24};
25 25
26&cluster_a15_opp_table { 26&cluster_a15_opp_table {
27 opp@1700000000 { 27 opp-1700000000 {
28 opp-microvolt = <1250000>; 28 opp-microvolt = <1250000>;
29 }; 29 };
30 opp@1600000000 { 30 opp-1600000000 {
31 opp-microvolt = <1250000>; 31 opp-microvolt = <1250000>;
32 }; 32 };
33 opp@1500000000 { 33 opp-1500000000 {
34 opp-microvolt = <1100000>; 34 opp-microvolt = <1100000>;
35 }; 35 };
36 opp@1400000000 { 36 opp-1400000000 {
37 opp-microvolt = <1100000>; 37 opp-microvolt = <1100000>;
38 }; 38 };
39 opp@1300000000 { 39 opp-1300000000 {
40 opp-microvolt = <1100000>; 40 opp-microvolt = <1100000>;
41 }; 41 };
42 opp@1200000000 { 42 opp-1200000000 {
43 opp-microvolt = <1000000>; 43 opp-microvolt = <1000000>;
44 }; 44 };
45 opp@1100000000 { 45 opp-1100000000 {
46 opp-microvolt = <1000000>; 46 opp-microvolt = <1000000>;
47 }; 47 };
48 opp@1000000000 { 48 opp-1000000000 {
49 opp-microvolt = <1000000>; 49 opp-microvolt = <1000000>;
50 }; 50 };
51 opp@900000000 { 51 opp-900000000 {
52 opp-microvolt = <1000000>; 52 opp-microvolt = <1000000>;
53 }; 53 };
54 opp@800000000 { 54 opp-800000000 {
55 opp-microvolt = <900000>; 55 opp-microvolt = <900000>;
56 }; 56 };
57 opp@700000000 { 57 opp-700000000 {
58 opp-microvolt = <900000>; 58 opp-microvolt = <900000>;
59 }; 59 };
60 opp@600000000 { 60 opp-600000000 {
61 opp-hz = /bits/ 64 <600000000>; 61 opp-hz = /bits/ 64 <600000000>;
62 opp-microvolt = <900000>; 62 opp-microvolt = <900000>;
63 clock-latency-ns = <140000>; 63 clock-latency-ns = <140000>;
64 }; 64 };
65 opp@500000000 { 65 opp-500000000 {
66 opp-hz = /bits/ 64 <500000000>; 66 opp-hz = /bits/ 64 <500000000>;
67 opp-microvolt = <900000>; 67 opp-microvolt = <900000>;
68 clock-latency-ns = <140000>; 68 clock-latency-ns = <140000>;
69 }; 69 };
70 opp@400000000 { 70 opp-400000000 {
71 opp-hz = /bits/ 64 <400000000>; 71 opp-hz = /bits/ 64 <400000000>;
72 opp-microvolt = <900000>; 72 opp-microvolt = <900000>;
73 clock-latency-ns = <140000>; 73 clock-latency-ns = <140000>;
74 }; 74 };
75 opp@300000000 { 75 opp-300000000 {
76 opp-hz = /bits/ 64 <300000000>; 76 opp-hz = /bits/ 64 <300000000>;
77 opp-microvolt = <900000>; 77 opp-microvolt = <900000>;
78 clock-latency-ns = <140000>; 78 clock-latency-ns = <140000>;
79 }; 79 };
80 opp@200000000 { 80 opp-200000000 {
81 opp-hz = /bits/ 64 <200000000>; 81 opp-hz = /bits/ 64 <200000000>;
82 opp-microvolt = <900000>; 82 opp-microvolt = <900000>;
83 clock-latency-ns = <140000>; 83 clock-latency-ns = <140000>;
@@ -85,46 +85,46 @@
85}; 85};
86 86
87&cluster_a7_opp_table { 87&cluster_a7_opp_table {
88 opp@1300000000 { 88 opp-1300000000 {
89 opp-microvolt = <1250000>; 89 opp-microvolt = <1250000>;
90 }; 90 };
91 opp@1200000000 { 91 opp-1200000000 {
92 opp-microvolt = <1250000>; 92 opp-microvolt = <1250000>;
93 }; 93 };
94 opp@1100000000 { 94 opp-1100000000 {
95 opp-microvolt = <1250000>; 95 opp-microvolt = <1250000>;
96 }; 96 };
97 opp@1000000000 { 97 opp-1000000000 {
98 opp-microvolt = <1100000>; 98 opp-microvolt = <1100000>;
99 }; 99 };
100 opp@900000000 { 100 opp-900000000 {
101 opp-microvolt = <1100000>; 101 opp-microvolt = <1100000>;
102 }; 102 };
103 opp@800000000 { 103 opp-800000000 {
104 opp-microvolt = <1100000>; 104 opp-microvolt = <1100000>;
105 }; 105 };
106 opp@700000000 { 106 opp-700000000 {
107 opp-microvolt = <1000000>; 107 opp-microvolt = <1000000>;
108 }; 108 };
109 opp@600000000 { 109 opp-600000000 {
110 opp-microvolt = <1000000>; 110 opp-microvolt = <1000000>;
111 }; 111 };
112 opp@500000000 { 112 opp-500000000 {
113 opp-hz = /bits/ 64 <500000000>; 113 opp-hz = /bits/ 64 <500000000>;
114 opp-microvolt = <1000000>; 114 opp-microvolt = <1000000>;
115 clock-latency-ns = <140000>; 115 clock-latency-ns = <140000>;
116 }; 116 };
117 opp@400000000 { 117 opp-400000000 {
118 opp-hz = /bits/ 64 <400000000>; 118 opp-hz = /bits/ 64 <400000000>;
119 opp-microvolt = <1000000>; 119 opp-microvolt = <1000000>;
120 clock-latency-ns = <140000>; 120 clock-latency-ns = <140000>;
121 }; 121 };
122 opp@300000000 { 122 opp-300000000 {
123 opp-hz = /bits/ 64 <300000000>; 123 opp-hz = /bits/ 64 <300000000>;
124 opp-microvolt = <900000>; 124 opp-microvolt = <900000>;
125 clock-latency-ns = <140000>; 125 clock-latency-ns = <140000>;
126 }; 126 };
127 opp@200000000 { 127 opp-200000000 {
128 opp-hz = /bits/ 64 <200000000>; 128 opp-hz = /bits/ 64 <200000000>;
129 opp-microvolt = <900000>; 129 opp-microvolt = <900000>;
130 clock-latency-ns = <140000>; 130 clock-latency-ns = <140000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index 098ad557fee3..e2b0da2c0bc7 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -106,6 +106,13 @@
106 }; 106 };
107 }; 107 };
108 108
109 irda_regulator: irda-regulator {
110 compatible = "regulator-fixed";
111 enable-active-high;
112 gpio = <&gpr3 3 GPIO_ACTIVE_HIGH>;
113 regulator-name = "irda_regulator";
114 };
115
109 sound { 116 sound {
110 compatible = "samsung,tm2-audio"; 117 compatible = "samsung,tm2-audio";
111 audio-codec = <&wm5110>; 118 audio-codec = <&wm5110>;
@@ -298,6 +305,8 @@
298 status = "okay"; 305 status = "okay";
299 vddcore-supply = <&ldo6_reg>; 306 vddcore-supply = <&ldo6_reg>;
300 vddio-supply = <&ldo7_reg>; 307 vddio-supply = <&ldo7_reg>;
308 samsung,burst-clock-frequency = <512000000>;
309 samsung,esc-clock-frequency = <16000000>;
301 samsung,pll-clock-frequency = <24000000>; 310 samsung,pll-clock-frequency = <24000000>;
302 pinctrl-names = "default"; 311 pinctrl-names = "default";
303 pinctrl-0 = <&te_irq>; 312 pinctrl-0 = <&te_irq>;
@@ -749,6 +758,19 @@
749 }; 758 };
750}; 759};
751 760
761&hsi2c_5 {
762 status = "okay";
763
764 stmfts: touchscreen@49 {
765 compatible = "st,stmfts";
766 reg = <0x49>;
767 interrupt-parent = <&gpa1>;
768 interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
769 avdd-supply = <&ldo30_reg>;
770 vdd-supply = <&ldo31_reg>;
771 };
772};
773
752&hsi2c_7 { 774&hsi2c_7 {
753 status = "okay"; 775 status = "okay";
754 776
@@ -894,7 +916,7 @@
894 PIN(INPUT, gpa0-7, NONE, FAST_SR1); 916 PIN(INPUT, gpa0-7, NONE, FAST_SR1);
895 917
896 PIN(INPUT, gpa1-0, UP, FAST_SR1); 918 PIN(INPUT, gpa1-0, UP, FAST_SR1);
897 PIN(INPUT, gpa1-1, NONE, FAST_SR1); 919 PIN(INPUT, gpa1-1, UP, FAST_SR1);
898 PIN(INPUT, gpa1-2, NONE, FAST_SR1); 920 PIN(INPUT, gpa1-2, NONE, FAST_SR1);
899 PIN(INPUT, gpa1-3, DOWN, FAST_SR1); 921 PIN(INPUT, gpa1-3, DOWN, FAST_SR1);
900 PIN(INPUT, gpa1-4, DOWN, FAST_SR1); 922 PIN(INPUT, gpa1-4, DOWN, FAST_SR1);
@@ -1074,7 +1096,6 @@
1074 PIN(INPUT, gpg3-0, DOWN, FAST_SR1); 1096 PIN(INPUT, gpg3-0, DOWN, FAST_SR1);
1075 PIN(INPUT, gpg3-1, DOWN, FAST_SR1); 1097 PIN(INPUT, gpg3-1, DOWN, FAST_SR1);
1076 PIN(INPUT, gpg3-5, DOWN, FAST_SR1); 1098 PIN(INPUT, gpg3-5, DOWN, FAST_SR1);
1077 PIN(INPUT, gpg3-7, DOWN, FAST_SR1);
1078 }; 1099 };
1079}; 1100};
1080 1101
@@ -1152,6 +1173,24 @@
1152 }; 1173 };
1153}; 1174};
1154 1175
1176&spi_3 {
1177 status = "okay";
1178 no-cs-readback;
1179
1180 irled@0 {
1181 compatible = "ir-spi-led";
1182 reg = <0x0>;
1183 spi-max-frequency = <5000000>;
1184 power-supply = <&irda_regulator>;
1185 duty-cycle = <60>;
1186 led-active-low;
1187
1188 controller-data {
1189 samsung,spi-feedback-delay = <0>;
1190 };
1191 };
1192};
1193
1155&timer { 1194&timer {
1156 clock-frequency = <24000000>; 1195 clock-frequency = <24000000>;
1157}; 1196};
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index dea0a6f5bc18..3ff95277a8ec 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -52,6 +52,18 @@
52 assigned-clock-rates = <250000000>, <400000000>; 52 assigned-clock-rates = <250000000>, <400000000>;
53}; 53};
54 54
55&dsi {
56 panel@0 {
57 compatible = "samsung,s6e3ha2";
58 reg = <0>;
59 vdd3-supply = <&ldo27_reg>;
60 vci-supply = <&ldo28_reg>;
61 reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
62 enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
63 te-gpios = <&gpf1 3 GPIO_ACTIVE_HIGH>;
64 };
65};
66
55&hsi2c_9 { 67&hsi2c_9 {
56 status = "okay"; 68 status = "okay";
57 69
@@ -76,3 +88,8 @@
76 regulator-min-microvolt = <3000000>; 88 regulator-min-microvolt = <3000000>;
77 regulator-max-microvolt = <3000000>; 89 regulator-max-microvolt = <3000000>;
78}; 90};
91
92&stmfts {
93 touchscreen-size-x = <1439>;
94 touchscreen-size-y = <2559>;
95};
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
index 7891a31adc17..b73e1231a86f 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
@@ -52,6 +52,17 @@
52 assigned-clock-rates = <278000000>, <400000000>; 52 assigned-clock-rates = <278000000>, <400000000>;
53}; 53};
54 54
55&dsi {
56 panel@0 {
57 compatible = "samsung,s6e3hf2";
58 reg = <0>;
59 vdd3-supply = <&ldo27_reg>;
60 vci-supply = <&ldo28_reg>;
61 reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
62 enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
63 };
64};
65
55&ldo31_reg { 66&ldo31_reg {
56 regulator-name = "TSP_VDD_1.8V_AP"; 67 regulator-name = "TSP_VDD_1.8V_AP";
57 regulator-min-microvolt = <1800000>; 68 regulator-min-microvolt = <1800000>;
@@ -63,3 +74,10 @@
63 regulator-min-microvolt = <3300000>; 74 regulator-min-microvolt = <3300000>;
64 regulator-max-microvolt = <3300000>; 75 regulator-max-microvolt = <3300000>;
65}; 76};
77
78&stmfts {
79 touchscreen-size-x = <1599>;
80 touchscreen-size-y = <2559>;
81 touch-key-connected;
82 ledvdd-supply = <&ldo33_reg>;
83};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-25 09:00:35 -0400