aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Faerber <afaerber@suse.de>2014-08-18 15:00:35 -0400
committerKukjin Kim <kgene.kim@samsung.com>2014-08-18 15:00:35 -0400
commit5fbc3f20d0bbf72423152f145e30a1d9e01ceadb (patch)
tree52bc4029ed3fdb7f2d84996bbd76813481bbf7bb
parentdf08d2eb66d9805118d9a94c1df0129b193c9a4f (diff)
ARM: dts: Fold exynos5250-cros-common into exynos5250-snow
exynos5250-cros-common.dtsi was meant for sharing common pieces across ChromeOS devices. This turned out premature, as several devices ended up in the common file that are not common after all. Since the remaining common ChromeOS pieces are fairly minor, exynos5250-cros-common.dtsi was requested to be merged into the Snow device tree, sharing only the keyboard controller for now. This may be re-evaluated as both mature. Suggested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Andreas Faerber <afaerber@suse.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/exynos5250-cros-common.dtsi164
-rw-r--r--arch/arm/boot/dts/exynos5250-snow.dts164
2 files changed, 145 insertions, 183 deletions
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
deleted file mode 100644
index e603e9c70142..000000000000
--- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
+++ /dev/null
@@ -1,164 +0,0 @@
1/*
2 * Common device tree include for all Exynos 5250 boards based off of Daisy.
3 *
4 * Copyright (c) 2012 Google, Inc
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9*/
10
11/ {
12 aliases {
13 };
14
15 memory {
16 reg = <0x40000000 0x80000000>;
17 };
18
19 chosen {
20 };
21
22 pinctrl@11400000 {
23 /*
24 * Disabled pullups since external part has its own pullups and
25 * double-pulling gets us out of spec in some cases.
26 */
27 i2c2_bus: i2c2-bus {
28 samsung,pin-pud = <0>;
29 };
30 };
31
32 i2c@12C60000 {
33 status = "okay";
34 samsung,i2c-sda-delay = <100>;
35 samsung,i2c-max-bus-freq = <378000>;
36 };
37
38 i2c@12C70000 {
39 status = "okay";
40 samsung,i2c-sda-delay = <100>;
41 samsung,i2c-max-bus-freq = <378000>;
42 };
43
44 i2c@12C80000 {
45 status = "okay";
46 samsung,i2c-sda-delay = <100>;
47 samsung,i2c-max-bus-freq = <66000>;
48
49 hdmiddc@50 {
50 compatible = "samsung,exynos4210-hdmiddc";
51 reg = <0x50>;
52 };
53 };
54
55 i2c@12C90000 {
56 status = "okay";
57 samsung,i2c-sda-delay = <100>;
58 samsung,i2c-max-bus-freq = <66000>;
59 };
60
61 i2c@12CA0000 {
62 status = "okay";
63 samsung,i2c-sda-delay = <100>;
64 samsung,i2c-max-bus-freq = <66000>;
65 };
66
67 i2c@12CB0000 {
68 status = "okay";
69 samsung,i2c-sda-delay = <100>;
70 samsung,i2c-max-bus-freq = <66000>;
71 };
72
73 i2c@12CD0000 {
74 status = "okay";
75 samsung,i2c-sda-delay = <100>;
76 samsung,i2c-max-bus-freq = <66000>;
77 };
78
79 i2c@12CE0000 {
80 status = "okay";
81 samsung,i2c-sda-delay = <100>;
82 samsung,i2c-max-bus-freq = <378000>;
83
84 hdmiphy: hdmiphy@38 {
85 compatible = "samsung,exynos4212-hdmiphy";
86 reg = <0x38>;
87 };
88 };
89
90 mmc@12200000 {
91 num-slots = <1>;
92 supports-highspeed;
93 broken-cd;
94 card-detect-delay = <200>;
95 samsung,dw-mshc-ciu-div = <3>;
96 samsung,dw-mshc-sdr-timing = <2 3>;
97 samsung,dw-mshc-ddr-timing = <1 2>;
98 pinctrl-names = "default";
99 pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
100
101 slot@0 {
102 reg = <0>;
103 bus-width = <8>;
104 };
105 };
106
107 mmc@12220000 {
108 num-slots = <1>;
109 supports-highspeed;
110 card-detect-delay = <200>;
111 samsung,dw-mshc-ciu-div = <3>;
112 samsung,dw-mshc-sdr-timing = <2 3>;
113 samsung,dw-mshc-ddr-timing = <1 2>;
114 pinctrl-names = "default";
115 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
116
117 slot@0 {
118 reg = <0>;
119 bus-width = <4>;
120 wp-gpios = <&gpc2 1 0>;
121 };
122 };
123
124 mmc@12230000 {
125 num-slots = <1>;
126 supports-highspeed;
127 broken-cd;
128 card-detect-delay = <200>;
129 samsung,dw-mshc-ciu-div = <3>;
130 samsung,dw-mshc-sdr-timing = <2 3>;
131 samsung,dw-mshc-ddr-timing = <1 2>;
132 /* See board-specific dts files for pin setup */
133
134 slot@0 {
135 reg = <0>;
136 bus-width = <4>;
137 };
138 };
139
140 spi_1: spi@12d30000 {
141 status = "okay";
142 samsung,spi-src-clk = <0>;
143 num-cs = <1>;
144 };
145
146 hdmi {
147 hpd-gpio = <&gpx3 7 0>;
148 pinctrl-names = "default";
149 pinctrl-0 = <&hdmi_hpd_irq>;
150 phy = <&hdmiphy>;
151 ddc = <&i2c_2>;
152 };
153
154 gpio-keys {
155 compatible = "gpio-keys";
156
157 power {
158 label = "Power";
159 gpios = <&gpx1 3 1>;
160 linux,code = <116>; /* KEY_POWER */
161 gpio-key,wakeup;
162 };
163 };
164};
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index eb437f6afec1..1c36cd72905f 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -10,7 +10,6 @@
10 10
11/dts-v1/; 11/dts-v1/;
12#include "exynos5250.dtsi" 12#include "exynos5250.dtsi"
13#include "exynos5250-cros-common.dtsi"
14 13
15/ { 14/ {
16 model = "Google Snow"; 15 model = "Google Snow";
@@ -20,6 +19,13 @@
20 i2c104 = &i2c_104; 19 i2c104 = &i2c_104;
21 }; 20 };
22 21
22 memory {
23 reg = <0x40000000 0x80000000>;
24 };
25
26 chosen {
27 };
28
23 rtc@101E0000 { 29 rtc@101E0000 {
24 status = "okay"; 30 status = "okay";
25 }; 31 };
@@ -93,6 +99,13 @@
93 gpio-keys { 99 gpio-keys {
94 compatible = "gpio-keys"; 100 compatible = "gpio-keys";
95 101
102 power {
103 label = "Power";
104 gpios = <&gpx1 3 1>;
105 linux,code = <116>; /* KEY_POWER */
106 gpio-key,wakeup;
107 };
108
96 lid-switch { 109 lid-switch {
97 label = "Lid"; 110 label = "Lid";
98 gpios = <&gpx3 5 1>; 111 gpios = <&gpx3 5 1>;
@@ -226,24 +239,6 @@
226 }; 239 };
227 }; 240 };
228 241
229 mmc@12200000 {
230 status = "okay";
231 };
232
233 mmc@12220000 {
234 status = "okay";
235 };
236
237 /*
238 * On Snow we've got SIP WiFi and so can keep drive strengths low to
239 * reduce EMI.
240 */
241 mmc@12230000 {
242 status = "okay";
243 pinctrl-names = "default";
244 pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
245 };
246
247 i2c@12CD0000 { 242 i2c@12CD0000 {
248 max98095: codec@11 { 243 max98095: codec@11 {
249 compatible = "maxim,max98095"; 244 compatible = "maxim,max98095";
@@ -292,6 +287,11 @@
292 }; 287 };
293 288
294 hdmi { 289 hdmi {
290 hpd-gpio = <&gpx3 7 0>;
291 pinctrl-names = "default";
292 pinctrl-0 = <&hdmi_hpd_irq>;
293 phy = <&hdmiphy>;
294 ddc = <&i2c_2>;
295 hdmi-en-supply = <&tps65090_fet7>; 295 hdmi-en-supply = <&tps65090_fet7>;
296 vdd-supply = <&ldo8_reg>; 296 vdd-supply = <&ldo8_reg>;
297 vdd_osc-supply = <&ldo10_reg>; 297 vdd_osc-supply = <&ldo10_reg>;
@@ -343,6 +343,10 @@
343}; 343};
344 344
345&i2c_0 { 345&i2c_0 {
346 status = "okay";
347 samsung,i2c-sda-delay = <100>;
348 samsung,i2c-max-bus-freq = <378000>;
349
346 max77686@09 { 350 max77686@09 {
347 compatible = "maxim,max77686"; 351 compatible = "maxim,max77686";
348 interrupt-parent = <&gpx3>; 352 interrupt-parent = <&gpx3>;
@@ -489,6 +493,10 @@
489}; 493};
490 494
491&i2c_1 { 495&i2c_1 {
496 status = "okay";
497 samsung,i2c-sda-delay = <100>;
498 samsung,i2c-max-bus-freq = <378000>;
499
492 trackpad { 500 trackpad {
493 reg = <0x67>; 501 reg = <0x67>;
494 compatible = "cypress,cyapa"; 502 compatible = "cypress,cyapa";
@@ -498,6 +506,118 @@
498 }; 506 };
499}; 507};
500 508
509/*
510 * Disabled pullups since external part has its own pullups and
511 * double-pulling gets us out of spec in some cases.
512 */
513&i2c2_bus {
514 samsung,pin-pud = <0>;
515};
516
517&i2c_2 {
518 status = "okay";
519 samsung,i2c-sda-delay = <100>;
520 samsung,i2c-max-bus-freq = <66000>;
521
522 hdmiddc@50 {
523 compatible = "samsung,exynos4210-hdmiddc";
524 reg = <0x50>;
525 };
526};
527
528&i2c_3 {
529 status = "okay";
530 samsung,i2c-sda-delay = <100>;
531 samsung,i2c-max-bus-freq = <66000>;
532};
533
534&i2c_4 {
535 status = "okay";
536 samsung,i2c-sda-delay = <100>;
537 samsung,i2c-max-bus-freq = <66000>;
538};
539
540&i2c_5 {
541 status = "okay";
542 samsung,i2c-sda-delay = <100>;
543 samsung,i2c-max-bus-freq = <66000>;
544};
545
546&i2c_7 {
547 status = "okay";
548 samsung,i2c-sda-delay = <100>;
549 samsung,i2c-max-bus-freq = <66000>;
550};
551
552&i2c_8 {
553 status = "okay";
554 samsung,i2c-sda-delay = <100>;
555 samsung,i2c-max-bus-freq = <378000>;
556
557 hdmiphy: hdmiphy@38 {
558 compatible = "samsung,exynos4212-hdmiphy";
559 reg = <0x38>;
560 };
561};
562
563&mmc_0 {
564 status = "okay";
565 num-slots = <1>;
566 supports-highspeed;
567 broken-cd;
568 card-detect-delay = <200>;
569 samsung,dw-mshc-ciu-div = <3>;
570 samsung,dw-mshc-sdr-timing = <2 3>;
571 samsung,dw-mshc-ddr-timing = <1 2>;
572 pinctrl-names = "default";
573 pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
574
575 slot@0 {
576 reg = <0>;
577 bus-width = <8>;
578 };
579};
580
581&mmc_2 {
582 status = "okay";
583 num-slots = <1>;
584 supports-highspeed;
585 card-detect-delay = <200>;
586 samsung,dw-mshc-ciu-div = <3>;
587 samsung,dw-mshc-sdr-timing = <2 3>;
588 samsung,dw-mshc-ddr-timing = <1 2>;
589 pinctrl-names = "default";
590 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
591
592 slot@0 {
593 reg = <0>;
594 bus-width = <4>;
595 wp-gpios = <&gpc2 1 0>;
596 };
597};
598
599/*
600 * On Snow we've got SIP WiFi and so can keep drive strengths low to
601 * reduce EMI.
602 */
603&mmc_3 {
604 status = "okay";
605 num-slots = <1>;
606 supports-highspeed;
607 broken-cd;
608 card-detect-delay = <200>;
609 samsung,dw-mshc-ciu-div = <3>;
610 samsung,dw-mshc-sdr-timing = <2 3>;
611 samsung,dw-mshc-ddr-timing = <1 2>;
612 pinctrl-names = "default";
613 pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
614
615 slot@0 {
616 reg = <0>;
617 bus-width = <4>;
618 };
619};
620
501&pinctrl_0 { 621&pinctrl_0 {
502 max77686_irq: max77686-irq { 622 max77686_irq: max77686-irq {
503 samsung,pins = "gpx3-2"; 623 samsung,pins = "gpx3-2";
@@ -507,4 +627,10 @@
507 }; 627 };
508}; 628};
509 629
630&spi_1 {
631 status = "okay";
632 samsung,spi-src-clk = <0>;
633 num-cs = <1>;
634};
635
510#include "cros-ec-keyboard.dtsi" 636#include "cros-ec-keyboard.dtsi"
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-19 03:57:53 -0400