aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/cros5250-common.dtsi3
-rw-r--r--arch/arm/boot/dts/dbx5x0.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi5
-rw-r--r--arch/arm/boot/dts/exynos5250-snow.dts127
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi5
-rw-r--r--arch/arm/boot/dts/imx28-m28evk.dts1
-rw-r--r--arch/arm/boot/dts/imx28-sps1.dts1
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi1
8 files changed, 142 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 8a5b3a6cdc58..0a61bbb9102f 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -193,7 +193,8 @@
193 }; 193 };
194 194
195 i2c@12CA0000 { 195 i2c@12CA0000 {
196 status = "disabled"; 196 samsung,i2c-sda-delay = <100>;
197 samsung,i2c-max-bus-freq = <66000>;
197 }; 198 };
198 199
199 i2c@12CB0000 { 200 i2c@12CB0000 {
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 9de93096601a..aaa63d0a8096 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -191,8 +191,8 @@
191 191
192 prcmu: prcmu@80157000 { 192 prcmu: prcmu@80157000 {
193 compatible = "stericsson,db8500-prcmu"; 193 compatible = "stericsson,db8500-prcmu";
194 reg = <0x80157000 0x1000>; 194 reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
195 reg-names = "prcmu"; 195 reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
196 interrupts = <0 47 0x4>; 196 interrupts = <0 47 0x4>;
197 #address-cells = <1>; 197 #address-cells = <1>;
198 #size-cells = <1>; 198 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index b8771c5cb2a3..7cfbbd3b7732 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -38,6 +38,11 @@
38 i2c7 = &i2c_7; 38 i2c7 = &i2c_7;
39 }; 39 };
40 40
41 chipid@10000000 {
42 compatible = "samsung,exynos4210-chipid";
43 reg = <0x10000000 0x100>;
44 };
45
41 pd_mfc: mfc-power-domain@10023C40 { 46 pd_mfc: mfc-power-domain@10023C40 {
42 compatible = "samsung,exynos4210-pd"; 47 compatible = "samsung,exynos4210-pd";
43 reg = <0x10023C40 0x20>; 48 reg = <0x10023C40 0x20>;
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 581ffae27e13..bf4744bab445 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -16,6 +16,10 @@
16 model = "Google Snow"; 16 model = "Google Snow";
17 compatible = "google,snow", "samsung,exynos5250"; 17 compatible = "google,snow", "samsung,exynos5250";
18 18
19 aliases {
20 i2c104 = &i2c_104;
21 };
22
19 pinctrl@11400000 { 23 pinctrl@11400000 {
20 sd3_clk: sd3-clk { 24 sd3_clk: sd3-clk {
21 samsung,pin-drv = <0>; 25 samsung,pin-drv = <0>;
@@ -44,6 +48,129 @@
44 }; 48 };
45 }; 49 };
46 50
51 i2c-arbitrator {
52 compatible = "i2c-arb-gpio-challenge";
53 #address-cells = <1>;
54 #size-cells = <0>;
55
56 i2c-parent = <&{/i2c@12CA0000}>;
57
58 our-claim-gpio = <&gpf0 3 1>;
59 their-claim-gpios = <&gpe0 4 1>;
60 slew-delay-us = <10>;
61 wait-retry-us = <3000>;
62 wait-free-us = <50000>;
63
64 /* Use ID 104 as a hint that we're on physical bus 4 */
65 i2c_104: i2c@0 {
66 reg = <0>;
67 #address-cells = <1>;
68 #size-cells = <0>;
69
70 battery: sbs-battery@b {
71 compatible = "sbs,sbs-battery";
72 reg = <0xb>;
73 sbs,poll-retry-count = <1>;
74 };
75
76 ec: embedded-controller {
77 compatible = "google,cros-ec-i2c";
78 reg = <0x1e>;
79 interrupts = <6 0>;
80 interrupt-parent = <&gpx1>;
81 wakeup-source;
82
83 keyboard-controller {
84 compatible = "google,cros-ec-keyb";
85 keypad,num-rows = <8>;
86 keypad,num-columns = <13>;
87 google,needs-ghost-filter;
88 linux,keymap = <0x0001003a /* CAPSLK */
89 0x0002003b /* F1 */
90 0x00030030 /* B */
91 0x00040044 /* F10 */
92 0x00060031 /* N */
93 0x0008000d /* = */
94 0x000a0064 /* R_ALT */
95
96 0x01010001 /* ESC */
97 0x0102003e /* F4 */
98 0x01030022 /* G */
99 0x01040041 /* F7 */
100 0x01060023 /* H */
101 0x01080028 /* ' */
102 0x01090043 /* F9 */
103 0x010b000e /* BKSPACE */
104
105 0x0200001d /* L_CTRL */
106 0x0201000f /* TAB */
107 0x0202003d /* F3 */
108 0x02030014 /* T */
109 0x02040040 /* F6 */
110 0x0205001b /* ] */
111 0x02060015 /* Y */
112 0x02070056 /* 102ND */
113 0x0208001a /* [ */
114 0x02090042 /* F8 */
115
116 0x03010029 /* GRAVE */
117 0x0302003c /* F2 */
118 0x03030006 /* 5 */
119 0x0304003f /* F5 */
120 0x03060007 /* 6 */
121 0x0308000c /* - */
122 0x030b002b /* \ */
123
124 0x04000061 /* R_CTRL */
125 0x0401001e /* A */
126 0x04020020 /* D */
127 0x04030021 /* F */
128 0x0404001f /* S */
129 0x04050025 /* K */
130 0x04060024 /* J */
131 0x04080027 /* ; */
132 0x04090026 /* L */
133 0x040b001c /* ENTER */
134
135 0x0501002c /* Z */
136 0x0502002e /* C */
137 0x0503002f /* V */
138 0x0504002d /* X */
139 0x05050033 /* , */
140 0x05060032 /* M */
141 0x0507002a /* L_SHIFT */
142 0x05080035 /* / */
143 0x05090034 /* . */
144 0x050B0039 /* SPACE */
145
146 0x06010002 /* 1 */
147 0x06020004 /* 3 */
148 0x06030005 /* 4 */
149 0x06040003 /* 2 */
150 0x06050009 /* 8 */
151 0x06060008 /* 7 */
152 0x0608000b /* 0 */
153 0x0609000a /* 9 */
154 0x060a0038 /* L_ALT */
155 0x060b006c /* DOWN */
156 0x060c006a /* RIGHT */
157
158 0x07010010 /* Q */
159 0x07020012 /* E */
160 0x07030013 /* R */
161 0x07040011 /* W */
162 0x07050017 /* I */
163 0x07060016 /* U */
164 0x07070036 /* R_SHIFT */
165 0x07080019 /* P */
166 0x07090018 /* O */
167 0x070b0067 /* UP */
168 0x070c0069>; /* LEFT */
169 };
170 };
171 };
172 };
173
47 /* 174 /*
48 * On Snow we've got SIP WiFi and so can keep drive strengths low to 175 * On Snow we've got SIP WiFi and so can keep drive strengths low to
49 * reduce EMI. 176 * reduce EMI.
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index af66e6b7bc77..53c37f0b763f 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -51,6 +51,11 @@
51 pinctrl3 = &pinctrl_3; 51 pinctrl3 = &pinctrl_3;
52 }; 52 };
53 53
54 chipid@10000000 {
55 compatible = "samsung,exynos4210-chipid";
56 reg = <0x10000000 0x100>;
57 };
58
54 pd_gsc: gsc-power-domain@0x10044000 { 59 pd_gsc: gsc-power-domain@0x10044000 {
55 compatible = "samsung,exynos4210-pd"; 60 compatible = "samsung,exynos4210-pd";
56 reg = <0x10044000 0x20>; 61 reg = <0x10044000 0x20>;
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 5f0ba99aa809..5aa44e05c9f5 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -177,7 +177,6 @@
177 i2c0: i2c@80058000 { 177 i2c0: i2c@80058000 {
178 pinctrl-names = "default"; 178 pinctrl-names = "default";
179 pinctrl-0 = <&i2c0_pins_a>; 179 pinctrl-0 = <&i2c0_pins_a>;
180 clock-frequency = <400000>;
181 status = "okay"; 180 status = "okay";
182 181
183 sgtl5000: codec@0a { 182 sgtl5000: codec@0a {
diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
index e6cde8aa7fff..6c6a5442800a 100644
--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -70,7 +70,6 @@
70 i2c0: i2c@80058000 { 70 i2c0: i2c@80058000 {
71 pinctrl-names = "default"; 71 pinctrl-names = "default";
72 pinctrl-0 = <&i2c0_pins_a>; 72 pinctrl-0 = <&i2c0_pins_a>;
73 clock-frequency = <400000>;
74 status = "okay"; 73 status = "okay";
75 74
76 rtc: rtc@51 { 75 rtc: rtc@51 {
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59e970f74e8f..491b0a0c24b0 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -97,6 +97,7 @@
97 compatible = "arm,cortex-a9-twd-timer"; 97 compatible = "arm,cortex-a9-twd-timer";
98 reg = <0x00a00600 0x20>; 98 reg = <0x00a00600 0x20>;
99 interrupts = <1 13 0xf01>; 99 interrupts = <1 13 0xf01>;
100 clocks = <&clks 15>;
100 }; 101 };
101 102
102 L2: l2-cache@00a02000 { 103 L2: l2-cache@00a02000 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-25 14:08:47 -0500