diff options
Diffstat (limited to 'arch/arm/boot')
31 files changed, 1430 insertions, 107 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 20358fb43450..55196639211d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -49,7 +49,10 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ | |||
49 | dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ | 49 | dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ |
50 | exynos4210-smdkv310.dtb \ | 50 | exynos4210-smdkv310.dtb \ |
51 | exynos4210-trats.dtb \ | 51 | exynos4210-trats.dtb \ |
52 | exynos4412-odroidx.dtb \ | ||
52 | exynos4412-smdk4412.dtb \ | 53 | exynos4412-smdk4412.dtb \ |
54 | exynos4412-origen.dtb \ | ||
55 | exynos5250-arndale.dtb \ | ||
53 | exynos5250-smdk5250.dtb \ | 56 | exynos5250-smdk5250.dtb \ |
54 | exynos5250-snow.dtb \ | 57 | exynos5250-snow.dtb \ |
55 | exynos5440-ssdk5440.dtb | 58 | exynos5440-ssdk5440.dtb |
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 46c098017036..62eceb4f0d3f 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi | |||
@@ -24,6 +24,144 @@ | |||
24 | samsung,i2c-max-bus-freq = <378000>; | 24 | samsung,i2c-max-bus-freq = <378000>; |
25 | gpios = <&gpb3 0 2 3 0>, | 25 | gpios = <&gpb3 0 2 3 0>, |
26 | <&gpb3 1 2 3 0>; | 26 | <&gpb3 1 2 3 0>; |
27 | |||
28 | max77686@09 { | ||
29 | compatible = "maxim,max77686"; | ||
30 | reg = <0x09>; | ||
31 | |||
32 | voltage-regulators { | ||
33 | ldo1_reg: LDO1 { | ||
34 | regulator-name = "P1.0V_LDO_OUT1"; | ||
35 | regulator-min-microvolt = <1000000>; | ||
36 | regulator-max-microvolt = <1000000>; | ||
37 | regulator-always-on; | ||
38 | }; | ||
39 | |||
40 | ldo2_reg: LDO2 { | ||
41 | regulator-name = "P1.8V_LDO_OUT2"; | ||
42 | regulator-min-microvolt = <1800000>; | ||
43 | regulator-max-microvolt = <1800000>; | ||
44 | regulator-always-on; | ||
45 | }; | ||
46 | |||
47 | ldo3_reg: LDO3 { | ||
48 | regulator-name = "P1.8V_LDO_OUT3"; | ||
49 | regulator-min-microvolt = <1800000>; | ||
50 | regulator-max-microvolt = <1800000>; | ||
51 | regulator-always-on; | ||
52 | }; | ||
53 | |||
54 | ldo7_reg: LDO7 { | ||
55 | regulator-name = "P1.1V_LDO_OUT7"; | ||
56 | regulator-min-microvolt = <1100000>; | ||
57 | regulator-max-microvolt = <1100000>; | ||
58 | regulator-always-on; | ||
59 | }; | ||
60 | |||
61 | ldo8_reg: LDO8 { | ||
62 | regulator-name = "P1.0V_LDO_OUT8"; | ||
63 | regulator-min-microvolt = <1000000>; | ||
64 | regulator-max-microvolt = <1000000>; | ||
65 | regulator-always-on; | ||
66 | }; | ||
67 | |||
68 | ldo10_reg: LDO10 { | ||
69 | regulator-name = "P1.8V_LDO_OUT10"; | ||
70 | regulator-min-microvolt = <1800000>; | ||
71 | regulator-max-microvolt = <1800000>; | ||
72 | regulator-always-on; | ||
73 | }; | ||
74 | |||
75 | ldo12_reg: LDO12 { | ||
76 | regulator-name = "P3.0V_LDO_OUT12"; | ||
77 | regulator-min-microvolt = <3000000>; | ||
78 | regulator-max-microvolt = <3000000>; | ||
79 | regulator-always-on; | ||
80 | }; | ||
81 | |||
82 | ldo14_reg: LDO14 { | ||
83 | regulator-name = "P1.8V_LDO_OUT14"; | ||
84 | regulator-min-microvolt = <1800000>; | ||
85 | regulator-max-microvolt = <1800000>; | ||
86 | regulator-always-on; | ||
87 | }; | ||
88 | |||
89 | ldo15_reg: LDO15 { | ||
90 | regulator-name = "P1.0V_LDO_OUT15"; | ||
91 | regulator-min-microvolt = <1000000>; | ||
92 | regulator-max-microvolt = <1000000>; | ||
93 | regulator-always-on; | ||
94 | }; | ||
95 | |||
96 | ldo16_reg: LDO16 { | ||
97 | regulator-name = "P1.8V_LDO_OUT16"; | ||
98 | regulator-min-microvolt = <1800000>; | ||
99 | regulator-max-microvolt = <1800000>; | ||
100 | regulator-always-on; | ||
101 | }; | ||
102 | |||
103 | buck1_reg: BUCK1 { | ||
104 | regulator-name = "vdd_mif"; | ||
105 | regulator-min-microvolt = <950000>; | ||
106 | regulator-max-microvolt = <1300000>; | ||
107 | regulator-always-on; | ||
108 | regulator-boot-on; | ||
109 | }; | ||
110 | |||
111 | buck2_reg: BUCK2 { | ||
112 | regulator-name = "vdd_arm"; | ||
113 | regulator-min-microvolt = <850000>; | ||
114 | regulator-max-microvolt = <1350000>; | ||
115 | regulator-always-on; | ||
116 | regulator-boot-on; | ||
117 | }; | ||
118 | |||
119 | buck3_reg: BUCK3 { | ||
120 | regulator-name = "vdd_int"; | ||
121 | regulator-min-microvolt = <900000>; | ||
122 | regulator-max-microvolt = <1200000>; | ||
123 | regulator-always-on; | ||
124 | regulator-boot-on; | ||
125 | }; | ||
126 | |||
127 | buck4_reg: BUCK4 { | ||
128 | regulator-name = "vdd_g3d"; | ||
129 | regulator-min-microvolt = <850000>; | ||
130 | regulator-max-microvolt = <1300000>; | ||
131 | regulator-always-on; | ||
132 | regulator-boot-on; | ||
133 | }; | ||
134 | |||
135 | buck5_reg: BUCK5 { | ||
136 | regulator-name = "P1.8V_BUCK_OUT5"; | ||
137 | regulator-min-microvolt = <1800000>; | ||
138 | regulator-max-microvolt = <1800000>; | ||
139 | regulator-always-on; | ||
140 | regulator-boot-on; | ||
141 | }; | ||
142 | |||
143 | buck6_reg: BUCK6 { | ||
144 | regulator-name = "P1.35V_BUCK_OUT6"; | ||
145 | regulator-min-microvolt = <1350000>; | ||
146 | regulator-max-microvolt = <1350000>; | ||
147 | regulator-always-on; | ||
148 | }; | ||
149 | |||
150 | buck7_reg: BUCK7 { | ||
151 | regulator-name = "P2.0V_BUCK_OUT7"; | ||
152 | regulator-min-microvolt = <2000000>; | ||
153 | regulator-max-microvolt = <2000000>; | ||
154 | regulator-always-on; | ||
155 | }; | ||
156 | |||
157 | buck8_reg: BUCK8 { | ||
158 | regulator-name = "P2.85V_BUCK_OUT8"; | ||
159 | regulator-min-microvolt = <2850000>; | ||
160 | regulator-max-microvolt = <2850000>; | ||
161 | regulator-always-on; | ||
162 | }; | ||
163 | }; | ||
164 | }; | ||
27 | }; | 165 | }; |
28 | 166 | ||
29 | i2c@12C70000 { | 167 | i2c@12C70000 { |
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 1a62bcf18aa3..9ac47d51c407 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
@@ -86,6 +86,8 @@ | |||
86 | compatible = "samsung,s3c2410-wdt"; | 86 | compatible = "samsung,s3c2410-wdt"; |
87 | reg = <0x10060000 0x100>; | 87 | reg = <0x10060000 0x100>; |
88 | interrupts = <0 43 0>; | 88 | interrupts = <0 43 0>; |
89 | clocks = <&clock 345>; | ||
90 | clock-names = "watchdog"; | ||
89 | status = "disabled"; | 91 | status = "disabled"; |
90 | }; | 92 | }; |
91 | 93 | ||
@@ -93,6 +95,8 @@ | |||
93 | compatible = "samsung,s3c6410-rtc"; | 95 | compatible = "samsung,s3c6410-rtc"; |
94 | reg = <0x10070000 0x100>; | 96 | reg = <0x10070000 0x100>; |
95 | interrupts = <0 44 0>, <0 45 0>; | 97 | interrupts = <0 44 0>, <0 45 0>; |
98 | clocks = <&clock 346>; | ||
99 | clock-names = "rtc"; | ||
96 | status = "disabled"; | 100 | status = "disabled"; |
97 | }; | 101 | }; |
98 | 102 | ||
@@ -100,6 +104,8 @@ | |||
100 | compatible = "samsung,s5pv210-keypad"; | 104 | compatible = "samsung,s5pv210-keypad"; |
101 | reg = <0x100A0000 0x100>; | 105 | reg = <0x100A0000 0x100>; |
102 | interrupts = <0 109 0>; | 106 | interrupts = <0 109 0>; |
107 | clocks = <&clock 347>; | ||
108 | clock-names = "keypad"; | ||
103 | status = "disabled"; | 109 | status = "disabled"; |
104 | }; | 110 | }; |
105 | 111 | ||
@@ -107,6 +113,8 @@ | |||
107 | compatible = "samsung,exynos4210-sdhci"; | 113 | compatible = "samsung,exynos4210-sdhci"; |
108 | reg = <0x12510000 0x100>; | 114 | reg = <0x12510000 0x100>; |
109 | interrupts = <0 73 0>; | 115 | interrupts = <0 73 0>; |
116 | clocks = <&clock 297>, <&clock 145>; | ||
117 | clock-names = "hsmmc", "mmc_busclk.2"; | ||
110 | status = "disabled"; | 118 | status = "disabled"; |
111 | }; | 119 | }; |
112 | 120 | ||
@@ -114,6 +122,8 @@ | |||
114 | compatible = "samsung,exynos4210-sdhci"; | 122 | compatible = "samsung,exynos4210-sdhci"; |
115 | reg = <0x12520000 0x100>; | 123 | reg = <0x12520000 0x100>; |
116 | interrupts = <0 74 0>; | 124 | interrupts = <0 74 0>; |
125 | clocks = <&clock 298>, <&clock 146>; | ||
126 | clock-names = "hsmmc", "mmc_busclk.2"; | ||
117 | status = "disabled"; | 127 | status = "disabled"; |
118 | }; | 128 | }; |
119 | 129 | ||
@@ -121,6 +131,8 @@ | |||
121 | compatible = "samsung,exynos4210-sdhci"; | 131 | compatible = "samsung,exynos4210-sdhci"; |
122 | reg = <0x12530000 0x100>; | 132 | reg = <0x12530000 0x100>; |
123 | interrupts = <0 75 0>; | 133 | interrupts = <0 75 0>; |
134 | clocks = <&clock 299>, <&clock 147>; | ||
135 | clock-names = "hsmmc", "mmc_busclk.2"; | ||
124 | status = "disabled"; | 136 | status = "disabled"; |
125 | }; | 137 | }; |
126 | 138 | ||
@@ -128,6 +140,16 @@ | |||
128 | compatible = "samsung,exynos4210-sdhci"; | 140 | compatible = "samsung,exynos4210-sdhci"; |
129 | reg = <0x12540000 0x100>; | 141 | reg = <0x12540000 0x100>; |
130 | interrupts = <0 76 0>; | 142 | interrupts = <0 76 0>; |
143 | clocks = <&clock 300>, <&clock 148>; | ||
144 | clock-names = "hsmmc", "mmc_busclk.2"; | ||
145 | status = "disabled"; | ||
146 | }; | ||
147 | |||
148 | mfc: codec@13400000 { | ||
149 | compatible = "samsung,mfc-v5"; | ||
150 | reg = <0x13400000 0x10000>; | ||
151 | interrupts = <0 94 0>; | ||
152 | samsung,power-domain = <&pd_mfc>; | ||
131 | status = "disabled"; | 153 | status = "disabled"; |
132 | }; | 154 | }; |
133 | 155 | ||
@@ -135,6 +157,8 @@ | |||
135 | compatible = "samsung,exynos4210-uart"; | 157 | compatible = "samsung,exynos4210-uart"; |
136 | reg = <0x13800000 0x100>; | 158 | reg = <0x13800000 0x100>; |
137 | interrupts = <0 52 0>; | 159 | interrupts = <0 52 0>; |
160 | clocks = <&clock 312>, <&clock 151>; | ||
161 | clock-names = "uart", "clk_uart_baud0"; | ||
138 | status = "disabled"; | 162 | status = "disabled"; |
139 | }; | 163 | }; |
140 | 164 | ||
@@ -142,6 +166,8 @@ | |||
142 | compatible = "samsung,exynos4210-uart"; | 166 | compatible = "samsung,exynos4210-uart"; |
143 | reg = <0x13810000 0x100>; | 167 | reg = <0x13810000 0x100>; |
144 | interrupts = <0 53 0>; | 168 | interrupts = <0 53 0>; |
169 | clocks = <&clock 313>, <&clock 152>; | ||
170 | clock-names = "uart", "clk_uart_baud0"; | ||
145 | status = "disabled"; | 171 | status = "disabled"; |
146 | }; | 172 | }; |
147 | 173 | ||
@@ -149,6 +175,8 @@ | |||
149 | compatible = "samsung,exynos4210-uart"; | 175 | compatible = "samsung,exynos4210-uart"; |
150 | reg = <0x13820000 0x100>; | 176 | reg = <0x13820000 0x100>; |
151 | interrupts = <0 54 0>; | 177 | interrupts = <0 54 0>; |
178 | clocks = <&clock 314>, <&clock 153>; | ||
179 | clock-names = "uart", "clk_uart_baud0"; | ||
152 | status = "disabled"; | 180 | status = "disabled"; |
153 | }; | 181 | }; |
154 | 182 | ||
@@ -156,6 +184,8 @@ | |||
156 | compatible = "samsung,exynos4210-uart"; | 184 | compatible = "samsung,exynos4210-uart"; |
157 | reg = <0x13830000 0x100>; | 185 | reg = <0x13830000 0x100>; |
158 | interrupts = <0 55 0>; | 186 | interrupts = <0 55 0>; |
187 | clocks = <&clock 315>, <&clock 154>; | ||
188 | clock-names = "uart", "clk_uart_baud0"; | ||
159 | status = "disabled"; | 189 | status = "disabled"; |
160 | }; | 190 | }; |
161 | 191 | ||
@@ -165,6 +195,8 @@ | |||
165 | compatible = "samsung,s3c2440-i2c"; | 195 | compatible = "samsung,s3c2440-i2c"; |
166 | reg = <0x13860000 0x100>; | 196 | reg = <0x13860000 0x100>; |
167 | interrupts = <0 58 0>; | 197 | interrupts = <0 58 0>; |
198 | clocks = <&clock 317>; | ||
199 | clock-names = "i2c"; | ||
168 | status = "disabled"; | 200 | status = "disabled"; |
169 | }; | 201 | }; |
170 | 202 | ||
@@ -174,6 +206,8 @@ | |||
174 | compatible = "samsung,s3c2440-i2c"; | 206 | compatible = "samsung,s3c2440-i2c"; |
175 | reg = <0x13870000 0x100>; | 207 | reg = <0x13870000 0x100>; |
176 | interrupts = <0 59 0>; | 208 | interrupts = <0 59 0>; |
209 | clocks = <&clock 318>; | ||
210 | clock-names = "i2c"; | ||
177 | status = "disabled"; | 211 | status = "disabled"; |
178 | }; | 212 | }; |
179 | 213 | ||
@@ -183,6 +217,8 @@ | |||
183 | compatible = "samsung,s3c2440-i2c"; | 217 | compatible = "samsung,s3c2440-i2c"; |
184 | reg = <0x13880000 0x100>; | 218 | reg = <0x13880000 0x100>; |
185 | interrupts = <0 60 0>; | 219 | interrupts = <0 60 0>; |
220 | clocks = <&clock 319>; | ||
221 | clock-names = "i2c"; | ||
186 | status = "disabled"; | 222 | status = "disabled"; |
187 | }; | 223 | }; |
188 | 224 | ||
@@ -192,6 +228,8 @@ | |||
192 | compatible = "samsung,s3c2440-i2c"; | 228 | compatible = "samsung,s3c2440-i2c"; |
193 | reg = <0x13890000 0x100>; | 229 | reg = <0x13890000 0x100>; |
194 | interrupts = <0 61 0>; | 230 | interrupts = <0 61 0>; |
231 | clocks = <&clock 320>; | ||
232 | clock-names = "i2c"; | ||
195 | status = "disabled"; | 233 | status = "disabled"; |
196 | }; | 234 | }; |
197 | 235 | ||
@@ -201,6 +239,8 @@ | |||
201 | compatible = "samsung,s3c2440-i2c"; | 239 | compatible = "samsung,s3c2440-i2c"; |
202 | reg = <0x138A0000 0x100>; | 240 | reg = <0x138A0000 0x100>; |
203 | interrupts = <0 62 0>; | 241 | interrupts = <0 62 0>; |
242 | clocks = <&clock 321>; | ||
243 | clock-names = "i2c"; | ||
204 | status = "disabled"; | 244 | status = "disabled"; |
205 | }; | 245 | }; |
206 | 246 | ||
@@ -210,6 +250,8 @@ | |||
210 | compatible = "samsung,s3c2440-i2c"; | 250 | compatible = "samsung,s3c2440-i2c"; |
211 | reg = <0x138B0000 0x100>; | 251 | reg = <0x138B0000 0x100>; |
212 | interrupts = <0 63 0>; | 252 | interrupts = <0 63 0>; |
253 | clocks = <&clock 322>; | ||
254 | clock-names = "i2c"; | ||
213 | status = "disabled"; | 255 | status = "disabled"; |
214 | }; | 256 | }; |
215 | 257 | ||
@@ -219,6 +261,8 @@ | |||
219 | compatible = "samsung,s3c2440-i2c"; | 261 | compatible = "samsung,s3c2440-i2c"; |
220 | reg = <0x138C0000 0x100>; | 262 | reg = <0x138C0000 0x100>; |
221 | interrupts = <0 64 0>; | 263 | interrupts = <0 64 0>; |
264 | clocks = <&clock 323>; | ||
265 | clock-names = "i2c"; | ||
222 | status = "disabled"; | 266 | status = "disabled"; |
223 | }; | 267 | }; |
224 | 268 | ||
@@ -228,6 +272,8 @@ | |||
228 | compatible = "samsung,s3c2440-i2c"; | 272 | compatible = "samsung,s3c2440-i2c"; |
229 | reg = <0x138D0000 0x100>; | 273 | reg = <0x138D0000 0x100>; |
230 | interrupts = <0 65 0>; | 274 | interrupts = <0 65 0>; |
275 | clocks = <&clock 324>; | ||
276 | clock-names = "i2c"; | ||
231 | status = "disabled"; | 277 | status = "disabled"; |
232 | }; | 278 | }; |
233 | 279 | ||
@@ -239,6 +285,8 @@ | |||
239 | rx-dma-channel = <&pdma0 6>; /* preliminary */ | 285 | rx-dma-channel = <&pdma0 6>; /* preliminary */ |
240 | #address-cells = <1>; | 286 | #address-cells = <1>; |
241 | #size-cells = <0>; | 287 | #size-cells = <0>; |
288 | clocks = <&clock 327>, <&clock 159>; | ||
289 | clock-names = "spi", "spi_busclk0"; | ||
242 | status = "disabled"; | 290 | status = "disabled"; |
243 | }; | 291 | }; |
244 | 292 | ||
@@ -250,6 +298,8 @@ | |||
250 | rx-dma-channel = <&pdma1 6>; /* preliminary */ | 298 | rx-dma-channel = <&pdma1 6>; /* preliminary */ |
251 | #address-cells = <1>; | 299 | #address-cells = <1>; |
252 | #size-cells = <0>; | 300 | #size-cells = <0>; |
301 | clocks = <&clock 328>, <&clock 160>; | ||
302 | clock-names = "spi", "spi_busclk0"; | ||
253 | status = "disabled"; | 303 | status = "disabled"; |
254 | }; | 304 | }; |
255 | 305 | ||
@@ -261,6 +311,8 @@ | |||
261 | rx-dma-channel = <&pdma0 8>; /* preliminary */ | 311 | rx-dma-channel = <&pdma0 8>; /* preliminary */ |
262 | #address-cells = <1>; | 312 | #address-cells = <1>; |
263 | #size-cells = <0>; | 313 | #size-cells = <0>; |
314 | clocks = <&clock 329>, <&clock 161>; | ||
315 | clock-names = "spi", "spi_busclk0"; | ||
264 | status = "disabled"; | 316 | status = "disabled"; |
265 | }; | 317 | }; |
266 | 318 | ||
@@ -275,6 +327,8 @@ | |||
275 | compatible = "arm,pl330", "arm,primecell"; | 327 | compatible = "arm,pl330", "arm,primecell"; |
276 | reg = <0x12680000 0x1000>; | 328 | reg = <0x12680000 0x1000>; |
277 | interrupts = <0 35 0>; | 329 | interrupts = <0 35 0>; |
330 | clocks = <&clock 292>; | ||
331 | clock-names = "apb_pclk"; | ||
278 | #dma-cells = <1>; | 332 | #dma-cells = <1>; |
279 | #dma-channels = <8>; | 333 | #dma-channels = <8>; |
280 | #dma-requests = <32>; | 334 | #dma-requests = <32>; |
@@ -284,6 +338,8 @@ | |||
284 | compatible = "arm,pl330", "arm,primecell"; | 338 | compatible = "arm,pl330", "arm,primecell"; |
285 | reg = <0x12690000 0x1000>; | 339 | reg = <0x12690000 0x1000>; |
286 | interrupts = <0 36 0>; | 340 | interrupts = <0 36 0>; |
341 | clocks = <&clock 293>; | ||
342 | clock-names = "apb_pclk"; | ||
287 | #dma-cells = <1>; | 343 | #dma-cells = <1>; |
288 | #dma-channels = <8>; | 344 | #dma-channels = <8>; |
289 | #dma-requests = <32>; | 345 | #dma-requests = <32>; |
@@ -293,6 +349,8 @@ | |||
293 | compatible = "arm,pl330", "arm,primecell"; | 349 | compatible = "arm,pl330", "arm,primecell"; |
294 | reg = <0x12850000 0x1000>; | 350 | reg = <0x12850000 0x1000>; |
295 | interrupts = <0 34 0>; | 351 | interrupts = <0 34 0>; |
352 | clocks = <&clock 279>; | ||
353 | clock-names = "apb_pclk"; | ||
296 | #dma-cells = <1>; | 354 | #dma-cells = <1>; |
297 | #dma-channels = <8>; | 355 | #dma-channels = <8>; |
298 | #dma-requests = <1>; | 356 | #dma-requests = <1>; |
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index f2710018e84e..1b30bc8e2654 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts | |||
@@ -57,6 +57,12 @@ | |||
57 | status = "okay"; | 57 | status = "okay"; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | codec@13400000 { | ||
61 | samsung,mfc-r = <0x43000000 0x800000>; | ||
62 | samsung,mfc-l = <0x51000000 0x800000>; | ||
63 | status = "okay"; | ||
64 | }; | ||
65 | |||
60 | serial@13800000 { | 66 | serial@13800000 { |
61 | status = "okay"; | 67 | status = "okay"; |
62 | }; | 68 | }; |
@@ -121,4 +127,16 @@ | |||
121 | linux,default-trigger = "heartbeat"; | 127 | linux,default-trigger = "heartbeat"; |
122 | }; | 128 | }; |
123 | }; | 129 | }; |
130 | |||
131 | fixed-rate-clocks { | ||
132 | xxti { | ||
133 | compatible = "samsung,clock-xxti"; | ||
134 | clock-frequency = <0>; | ||
135 | }; | ||
136 | |||
137 | xusbxti { | ||
138 | compatible = "samsung,clock-xusbxti"; | ||
139 | clock-frequency = <24000000>; | ||
140 | }; | ||
141 | }; | ||
124 | }; | 142 | }; |
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index f63490707f3a..f52c86e2d424 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts | |||
@@ -43,6 +43,12 @@ | |||
43 | status = "okay"; | 43 | status = "okay"; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | codec@13400000 { | ||
47 | samsung,mfc-r = <0x43000000 0x800000>; | ||
48 | samsung,mfc-l = <0x51000000 0x800000>; | ||
49 | status = "okay"; | ||
50 | }; | ||
51 | |||
46 | serial@13800000 { | 52 | serial@13800000 { |
47 | status = "okay"; | 53 | status = "okay"; |
48 | }; | 54 | }; |
@@ -189,4 +195,16 @@ | |||
189 | }; | 195 | }; |
190 | }; | 196 | }; |
191 | }; | 197 | }; |
198 | |||
199 | fixed-rate-clocks { | ||
200 | xxti { | ||
201 | compatible = "samsung,clock-xxti"; | ||
202 | clock-frequency = <12000000>; | ||
203 | }; | ||
204 | |||
205 | xusbxti { | ||
206 | compatible = "samsung,clock-xusbxti"; | ||
207 | clock-frequency = <24000000>; | ||
208 | }; | ||
209 | }; | ||
192 | }; | 210 | }; |
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index c346b64dff55..9a14484c7bb1 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts | |||
@@ -289,4 +289,16 @@ | |||
289 | }; | 289 | }; |
290 | }; | 290 | }; |
291 | }; | 291 | }; |
292 | |||
293 | fixed-rate-clocks { | ||
294 | xxti { | ||
295 | compatible = "samsung,clock-xxti"; | ||
296 | clock-frequency = <0>; | ||
297 | }; | ||
298 | |||
299 | xusbxti { | ||
300 | compatible = "samsung,clock-xusbxti"; | ||
301 | clock-frequency = <24000000>; | ||
302 | }; | ||
303 | }; | ||
292 | }; | 304 | }; |
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 2feffc70814c..15143bdbafb8 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi | |||
@@ -47,6 +47,42 @@ | |||
47 | <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>; | 47 | <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | mct@10050000 { | ||
51 | compatible = "samsung,exynos4210-mct"; | ||
52 | reg = <0x10050000 0x800>; | ||
53 | interrupt-controller; | ||
54 | #interrups-cells = <2>; | ||
55 | interrupt-parent = <&mct_map>; | ||
56 | interrupts = <0 0>, <1 0>, <2 0>, <3 0>, | ||
57 | <4 0>, <5 0>; | ||
58 | clocks = <&clock 3>, <&clock 344>; | ||
59 | clock-names = "fin_pll", "mct"; | ||
60 | |||
61 | mct_map: mct-map { | ||
62 | #interrupt-cells = <2>; | ||
63 | #address-cells = <0>; | ||
64 | #size-cells = <0>; | ||
65 | interrupt-map = <0x0 0 &gic 0 57 0>, | ||
66 | <0x1 0 &gic 0 69 0>, | ||
67 | <0x2 0 &combiner 12 6>, | ||
68 | <0x3 0 &combiner 12 7>, | ||
69 | <0x4 0 &gic 0 42 0>, | ||
70 | <0x5 0 &gic 0 48 0>; | ||
71 | }; | ||
72 | }; | ||
73 | |||
74 | clock: clock-controller@0x10030000 { | ||
75 | compatible = "samsung,exynos4210-clock"; | ||
76 | reg = <0x10030000 0x20000>; | ||
77 | #clock-cells = <1>; | ||
78 | }; | ||
79 | |||
80 | pmu { | ||
81 | compatible = "arm,cortex-a9-pmu"; | ||
82 | interrupt-parent = <&combiner>; | ||
83 | interrupts = <2 2>, <3 2>; | ||
84 | }; | ||
85 | |||
50 | pinctrl_0: pinctrl@11400000 { | 86 | pinctrl_0: pinctrl@11400000 { |
51 | compatible = "samsung,exynos4210-pinctrl"; | 87 | compatible = "samsung,exynos4210-pinctrl"; |
52 | reg = <0x11400000 0x1000>; | 88 | reg = <0x11400000 0x1000>; |
diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index c6ae2005961f..36d4299789ef 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi | |||
@@ -25,4 +25,26 @@ | |||
25 | gic:interrupt-controller@10490000 { | 25 | gic:interrupt-controller@10490000 { |
26 | cpu-offset = <0x8000>; | 26 | cpu-offset = <0x8000>; |
27 | }; | 27 | }; |
28 | |||
29 | mct@10050000 { | ||
30 | compatible = "samsung,exynos4412-mct"; | ||
31 | reg = <0x10050000 0x800>; | ||
32 | interrupt-controller; | ||
33 | #interrups-cells = <2>; | ||
34 | interrupt-parent = <&mct_map>; | ||
35 | interrupts = <0 0>, <1 0>, <2 0>, <3 0>, | ||
36 | <4 0>, <5 0>; | ||
37 | |||
38 | mct_map: mct-map { | ||
39 | #interrupt-cells = <2>; | ||
40 | #address-cells = <0>; | ||
41 | #size-cells = <0>; | ||
42 | interrupt-map = <0x0 0 &gic 0 57 0>, | ||
43 | <0x1 0 &combiner 12 5>, | ||
44 | <0x2 0 &combiner 12 6>, | ||
45 | <0x3 0 &combiner 12 7>, | ||
46 | <0x4 0 &gic 1 12 0>, | ||
47 | <0x5 0 &gic 1 12 0>; | ||
48 | }; | ||
49 | }; | ||
28 | }; | 50 | }; |
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts new file mode 100644 index 000000000000..53bc8bf77984 --- /dev/null +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts | |||
@@ -0,0 +1,111 @@ | |||
1 | /* | ||
2 | * Hardkernel's Exynos4412 based ODROID-X board device tree source | ||
3 | * | ||
4 | * Copyright (c) 2012 Dongjin Kim <tobetter@gmail.com> | ||
5 | * | ||
6 | * Device tree source file for Hardkernel's ODROID-X board which is based on | ||
7 | * Samsung's Exynos4412 SoC. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | /dts-v1/; | ||
15 | /include/ "exynos4412.dtsi" | ||
16 | |||
17 | / { | ||
18 | model = "Hardkernel ODROID-X board based on Exynos4412"; | ||
19 | compatible = "hardkernel,odroid-x", "samsung,exynos4412"; | ||
20 | |||
21 | memory { | ||
22 | reg = <0x40000000 0x40000000>; | ||
23 | }; | ||
24 | |||
25 | leds { | ||
26 | compatible = "gpio-leds"; | ||
27 | led1 { | ||
28 | label = "led1:heart"; | ||
29 | gpios = <&gpc1 0 1>; | ||
30 | default-state = "on"; | ||
31 | linux,default-trigger = "heartbeat"; | ||
32 | }; | ||
33 | led2 { | ||
34 | label = "led2:mmc0"; | ||
35 | gpios = <&gpc1 2 1>; | ||
36 | default-state = "on"; | ||
37 | linux,default-trigger = "mmc0"; | ||
38 | }; | ||
39 | }; | ||
40 | |||
41 | mshc@12550000 { | ||
42 | #address-cells = <1>; | ||
43 | #size-cells = <0>; | ||
44 | pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; | ||
45 | pinctrl-names = "default"; | ||
46 | status = "okay"; | ||
47 | |||
48 | num-slots = <1>; | ||
49 | supports-highspeed; | ||
50 | broken-cd; | ||
51 | fifo-depth = <0x80>; | ||
52 | card-detect-delay = <200>; | ||
53 | samsung,dw-mshc-ciu-div = <3>; | ||
54 | samsung,dw-mshc-sdr-timing = <2 3>; | ||
55 | samsung,dw-mshc-ddr-timing = <1 2>; | ||
56 | |||
57 | slot@0 { | ||
58 | reg = <0>; | ||
59 | bus-width = <8>; | ||
60 | }; | ||
61 | }; | ||
62 | |||
63 | regulator_p3v3 { | ||
64 | compatible = "regulator-fixed"; | ||
65 | regulator-name = "p3v3_en"; | ||
66 | regulator-min-microvolt = <3300000>; | ||
67 | regulator-max-microvolt = <3300000>; | ||
68 | gpio = <&gpa1 1 1>; | ||
69 | enable-active-high; | ||
70 | regulator-boot-on; | ||
71 | }; | ||
72 | |||
73 | rtc@10070000 { | ||
74 | status = "okay"; | ||
75 | }; | ||
76 | |||
77 | sdhci@12530000 { | ||
78 | bus-width = <4>; | ||
79 | pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; | ||
80 | pinctrl-names = "default"; | ||
81 | status = "okay"; | ||
82 | }; | ||
83 | |||
84 | serial@13800000 { | ||
85 | status = "okay"; | ||
86 | }; | ||
87 | |||
88 | serial@13810000 { | ||
89 | status = "okay"; | ||
90 | }; | ||
91 | |||
92 | serial@13820000 { | ||
93 | status = "okay"; | ||
94 | }; | ||
95 | |||
96 | serial@13830000 { | ||
97 | status = "okay"; | ||
98 | }; | ||
99 | |||
100 | fixed-rate-clocks { | ||
101 | xxti { | ||
102 | compatible = "samsung,clock-xxti"; | ||
103 | clock-frequency = <0>; | ||
104 | }; | ||
105 | |||
106 | xusbxti { | ||
107 | compatible = "samsung,clock-xusbxti"; | ||
108 | clock-frequency = <24000000>; | ||
109 | }; | ||
110 | }; | ||
111 | }; | ||
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts new file mode 100644 index 000000000000..1fecf7666dc0 --- /dev/null +++ b/arch/arm/boot/dts/exynos4412-origen.dts | |||
@@ -0,0 +1,432 @@ | |||
1 | /* | ||
2 | * Insignal's Exynos4412 based Origen board device tree source | ||
3 | * | ||
4 | * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * | ||
7 | * Device tree source file for Insignal's Origen board which is based on | ||
8 | * Samsung's Exynos4412 SoC. | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | /dts-v1/; | ||
16 | /include/ "exynos4412.dtsi" | ||
17 | |||
18 | / { | ||
19 | model = "Insignal Origen evaluation board based on Exynos4412"; | ||
20 | compatible = "insignal,origen4412", "samsung,exynos4412"; | ||
21 | |||
22 | memory { | ||
23 | reg = <0x40000000 0x40000000>; | ||
24 | }; | ||
25 | |||
26 | chosen { | ||
27 | bootargs ="console=ttySAC2,115200"; | ||
28 | }; | ||
29 | |||
30 | mmc_reg: voltage-regulator { | ||
31 | compatible = "regulator-fixed"; | ||
32 | regulator-name = "VMEM_VDD_2.8V"; | ||
33 | regulator-min-microvolt = <2800000>; | ||
34 | regulator-max-microvolt = <2800000>; | ||
35 | gpio = <&gpx1 1 0>; | ||
36 | enable-active-high; | ||
37 | }; | ||
38 | |||
39 | sdhci@12530000 { | ||
40 | bus-width = <4>; | ||
41 | pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; | ||
42 | pinctrl-names = "default"; | ||
43 | vmmc-supply = <&mmc_reg>; | ||
44 | status = "okay"; | ||
45 | }; | ||
46 | |||
47 | mshc@12550000 { | ||
48 | #address-cells = <1>; | ||
49 | #size-cells = <0>; | ||
50 | pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; | ||
51 | pinctrl-names = "default"; | ||
52 | status = "okay"; | ||
53 | |||
54 | num-slots = <1>; | ||
55 | supports-highspeed; | ||
56 | broken-cd; | ||
57 | fifo-depth = <0x80>; | ||
58 | card-detect-delay = <200>; | ||
59 | samsung,dw-mshc-ciu-div = <3>; | ||
60 | samsung,dw-mshc-sdr-timing = <2 3>; | ||
61 | samsung,dw-mshc-ddr-timing = <1 2>; | ||
62 | |||
63 | slot@0 { | ||
64 | reg = <0>; | ||
65 | bus-width = <8>; | ||
66 | }; | ||
67 | }; | ||
68 | |||
69 | codec@13400000 { | ||
70 | samsung,mfc-r = <0x43000000 0x800000>; | ||
71 | samsung,mfc-l = <0x51000000 0x800000>; | ||
72 | status = "okay"; | ||
73 | }; | ||
74 | |||
75 | serial@13800000 { | ||
76 | status = "okay"; | ||
77 | }; | ||
78 | |||
79 | serial@13810000 { | ||
80 | status = "okay"; | ||
81 | }; | ||
82 | |||
83 | serial@13820000 { | ||
84 | status = "okay"; | ||
85 | }; | ||
86 | |||
87 | serial@13830000 { | ||
88 | status = "okay"; | ||
89 | }; | ||
90 | |||
91 | i2c@13860000 { | ||
92 | #address-cells = <1>; | ||
93 | #size-cells = <0>; | ||
94 | samsung,i2c-sda-delay = <100>; | ||
95 | samsung,i2c-max-bus-freq = <20000>; | ||
96 | pinctrl-0 = <&i2c0_bus>; | ||
97 | pinctrl-names = "default"; | ||
98 | status = "okay"; | ||
99 | |||
100 | s5m8767_pmic@66 { | ||
101 | compatible = "samsung,s5m8767-pmic"; | ||
102 | reg = <0x66>; | ||
103 | |||
104 | s5m8767,pmic-buck-default-dvs-idx = <3>; | ||
105 | |||
106 | s5m8767,pmic-buck-dvs-gpios = <&gpx2 3 0>, | ||
107 | <&gpx2 4 0>, | ||
108 | <&gpx2 5 0>; | ||
109 | |||
110 | s5m8767,pmic-buck-ds-gpios = <&gpm3 5 0>, | ||
111 | <&gpm3 6 0>, | ||
112 | <&gpm3 7 0>; | ||
113 | |||
114 | s5m8767,pmic-buck2-dvs-voltage = <1250000>, <1200000>, | ||
115 | <1200000>, <1200000>, | ||
116 | <1200000>, <1200000>, | ||
117 | <1200000>, <1200000>; | ||
118 | |||
119 | s5m8767,pmic-buck3-dvs-voltage = <1100000>, <1100000>, | ||
120 | <1100000>, <1100000>, | ||
121 | <1100000>, <1100000>, | ||
122 | <1100000>, <1100000>; | ||
123 | |||
124 | s5m8767,pmic-buck4-dvs-voltage = <1200000>, <1200000>, | ||
125 | <1200000>, <1200000>, | ||
126 | <1200000>, <1200000>, | ||
127 | <1200000>, <1200000>; | ||
128 | |||
129 | regulators { | ||
130 | ldo1_reg: LDO1 { | ||
131 | regulator-name = "VDD_ALIVE"; | ||
132 | regulator-min-microvolt = <1100000>; | ||
133 | regulator-max-microvolt = <1100000>; | ||
134 | regulator-always-on; | ||
135 | regulator-boot-on; | ||
136 | op_mode = <1>; /* Normal Mode */ | ||
137 | }; | ||
138 | |||
139 | ldo2_reg: LDO2 { | ||
140 | regulator-name = "VDDQ_M12"; | ||
141 | regulator-min-microvolt = <1200000>; | ||
142 | regulator-max-microvolt = <1200000>; | ||
143 | regulator-always-on; | ||
144 | op_mode = <1>; /* Normal Mode */ | ||
145 | }; | ||
146 | |||
147 | ldo3_reg: LDO3 { | ||
148 | regulator-name = "VDDIOAP_18"; | ||
149 | regulator-min-microvolt = <1800000>; | ||
150 | regulator-max-microvolt = <1800000>; | ||
151 | regulator-always-on; | ||
152 | op_mode = <1>; /* Normal Mode */ | ||
153 | }; | ||
154 | |||
155 | ldo4_reg: LDO4 { | ||
156 | regulator-name = "VDDQ_PRE"; | ||
157 | regulator-min-microvolt = <1800000>; | ||
158 | regulator-max-microvolt = <1800000>; | ||
159 | regulator-always-on; | ||
160 | op_mode = <1>; /* Normal Mode */ | ||
161 | }; | ||
162 | |||
163 | ldo5_reg: LDO5 { | ||
164 | regulator-name = "VDD18_2M"; | ||
165 | regulator-min-microvolt = <1800000>; | ||
166 | regulator-max-microvolt = <1800000>; | ||
167 | regulator-always-on; | ||
168 | op_mode = <1>; /* Normal Mode */ | ||
169 | }; | ||
170 | |||
171 | ldo6_reg: LDO6 { | ||
172 | regulator-name = "VDD10_MPLL"; | ||
173 | regulator-min-microvolt = <1000000>; | ||
174 | regulator-max-microvolt = <1000000>; | ||
175 | regulator-always-on; | ||
176 | op_mode = <1>; /* Normal Mode */ | ||
177 | }; | ||
178 | |||
179 | ldo7_reg: LDO7 { | ||
180 | regulator-name = "VDD10_XPLL"; | ||
181 | regulator-min-microvolt = <1000000>; | ||
182 | regulator-max-microvolt = <1000000>; | ||
183 | regulator-always-on; | ||
184 | op_mode = <1>; /* Normal Mode */ | ||
185 | }; | ||
186 | |||
187 | ldo8_reg: LDO8 { | ||
188 | regulator-name = "VDD10_MIPI"; | ||
189 | regulator-min-microvolt = <1000000>; | ||
190 | regulator-max-microvolt = <1000000>; | ||
191 | regulator-always-on; | ||
192 | op_mode = <1>; /* Normal Mode */ | ||
193 | }; | ||
194 | |||
195 | ldo9_reg: LDO9 { | ||
196 | regulator-name = "VDD33_LCD"; | ||
197 | regulator-min-microvolt = <3300000>; | ||
198 | regulator-max-microvolt = <3300000>; | ||
199 | regulator-always-on; | ||
200 | op_mode = <1>; /* Normal Mode */ | ||
201 | }; | ||
202 | |||
203 | ldo10_reg: LDO10 { | ||
204 | regulator-name = "VDD18_MIPI"; | ||
205 | regulator-min-microvolt = <1800000>; | ||
206 | regulator-max-microvolt = <1800000>; | ||
207 | regulator-always-on; | ||
208 | op_mode = <1>; /* Normal Mode */ | ||
209 | }; | ||
210 | |||
211 | ldo11_reg: LDO11 { | ||
212 | regulator-name = "VDD18_ABB1"; | ||
213 | regulator-min-microvolt = <1800000>; | ||
214 | regulator-max-microvolt = <1800000>; | ||
215 | regulator-always-on; | ||
216 | op_mode = <1>; /* Normal Mode */ | ||
217 | }; | ||
218 | |||
219 | ldo12_reg: LDO12 { | ||
220 | regulator-name = "VDD33_UOTG"; | ||
221 | regulator-min-microvolt = <3300000>; | ||
222 | regulator-max-microvolt = <3300000>; | ||
223 | regulator-always-on; | ||
224 | op_mode = <1>; /* Normal Mode */ | ||
225 | }; | ||
226 | |||
227 | ldo13_reg: LDO13 { | ||
228 | regulator-name = "VDDIOPERI_18"; | ||
229 | regulator-min-microvolt = <1800000>; | ||
230 | regulator-max-microvolt = <1800000>; | ||
231 | regulator-always-on; | ||
232 | op_mode = <1>; /* Normal Mode */ | ||
233 | }; | ||
234 | |||
235 | ldo14_reg: LDO14 { | ||
236 | regulator-name = "VDD18_ABB02"; | ||
237 | regulator-min-microvolt = <1800000>; | ||
238 | regulator-max-microvolt = <1800000>; | ||
239 | regulator-always-on; | ||
240 | op_mode = <1>; /* Normal Mode */ | ||
241 | }; | ||
242 | |||
243 | ldo15_reg: LDO15 { | ||
244 | regulator-name = "VDD10_USH"; | ||
245 | regulator-min-microvolt = <1000000>; | ||
246 | regulator-max-microvolt = <1000000>; | ||
247 | regulator-always-on; | ||
248 | op_mode = <1>; /* Normal Mode */ | ||
249 | }; | ||
250 | |||
251 | ldo16_reg: LDO16 { | ||
252 | regulator-name = "VDD18_HSIC"; | ||
253 | regulator-min-microvolt = <1800000>; | ||
254 | regulator-max-microvolt = <1800000>; | ||
255 | regulator-always-on; | ||
256 | op_mode = <1>; /* Normal Mode */ | ||
257 | }; | ||
258 | |||
259 | ldo17_reg: LDO17 { | ||
260 | regulator-name = "VDDIOAP_MMC012_28"; | ||
261 | regulator-min-microvolt = <2800000>; | ||
262 | regulator-max-microvolt = <2800000>; | ||
263 | regulator-always-on; | ||
264 | op_mode = <1>; /* Normal Mode */ | ||
265 | }; | ||
266 | |||
267 | ldo18_reg: LDO18 { | ||
268 | regulator-name = "VDDIOPERI_28"; | ||
269 | regulator-min-microvolt = <2800000>; | ||
270 | regulator-max-microvolt = <2800000>; | ||
271 | regulator-always-on; | ||
272 | op_mode = <1>; /* Normal Mode */ | ||
273 | }; | ||
274 | |||
275 | ldo19_reg: LDO19 { | ||
276 | regulator-name = "DVDD25"; | ||
277 | regulator-min-microvolt = <2500000>; | ||
278 | regulator-max-microvolt = <2500000>; | ||
279 | regulator-always-on; | ||
280 | op_mode = <1>; /* Normal Mode */ | ||
281 | }; | ||
282 | |||
283 | ldo20_reg: LDO20 { | ||
284 | regulator-name = "VDD28_CAM"; | ||
285 | regulator-min-microvolt = <2800000>; | ||
286 | regulator-max-microvolt = <2800000>; | ||
287 | regulator-always-on; | ||
288 | op_mode = <1>; /* Normal Mode */ | ||
289 | }; | ||
290 | |||
291 | ldo21_reg: LDO21 { | ||
292 | regulator-name = "VDD28_AF"; | ||
293 | regulator-min-microvolt = <2800000>; | ||
294 | regulator-max-microvolt = <2800000>; | ||
295 | regulator-always-on; | ||
296 | op_mode = <1>; /* Normal Mode */ | ||
297 | }; | ||
298 | |||
299 | ldo22_reg: LDO22 { | ||
300 | regulator-name = "VDDA28_2M"; | ||
301 | regulator-min-microvolt = <2800000>; | ||
302 | regulator-max-microvolt = <2800000>; | ||
303 | regulator-always-on; | ||
304 | op_mode = <1>; /* Normal Mode */ | ||
305 | }; | ||
306 | |||
307 | ldo23_reg: LDO23 { | ||
308 | regulator-name = "VDD28_TF"; | ||
309 | regulator-min-microvolt = <2800000>; | ||
310 | regulator-max-microvolt = <2800000>; | ||
311 | regulator-always-on; | ||
312 | op_mode = <1>; /* Normal Mode */ | ||
313 | }; | ||
314 | |||
315 | ldo24_reg: LDO24 { | ||
316 | regulator-name = "VDD33_A31"; | ||
317 | regulator-min-microvolt = <3300000>; | ||
318 | regulator-max-microvolt = <3300000>; | ||
319 | regulator-always-on; | ||
320 | op_mode = <1>; /* Normal Mode */ | ||
321 | }; | ||
322 | |||
323 | ldo25_reg: LDO25 { | ||
324 | regulator-name = "VDD18_CAM"; | ||
325 | regulator-min-microvolt = <1800000>; | ||
326 | regulator-max-microvolt = <1800000>; | ||
327 | regulator-always-on; | ||
328 | op_mode = <1>; /* Normal Mode */ | ||
329 | }; | ||
330 | |||
331 | ldo26_reg: LDO26 { | ||
332 | regulator-name = "VDD18_A31"; | ||
333 | regulator-min-microvolt = <1800000>; | ||
334 | regulator-max-microvolt = <1800000>; | ||
335 | regulator-always-on; | ||
336 | op_mode = <1>; /* Normal Mode */ | ||
337 | }; | ||
338 | |||
339 | ldo27_reg: LDO27 { | ||
340 | regulator-name = "GPS_1V8"; | ||
341 | regulator-min-microvolt = <1800000>; | ||
342 | regulator-max-microvolt = <1800000>; | ||
343 | regulator-always-on; | ||
344 | op_mode = <1>; /* Normal Mode */ | ||
345 | }; | ||
346 | |||
347 | ldo28_reg: LDO28 { | ||
348 | regulator-name = "DVDD12"; | ||
349 | regulator-min-microvolt = <1200000>; | ||
350 | regulator-max-microvolt = <1200000>; | ||
351 | regulator-always-on; | ||
352 | op_mode = <1>; /* Normal Mode */ | ||
353 | }; | ||
354 | |||
355 | buck1_reg: BUCK1 { | ||
356 | regulator-name = "vdd_mif"; | ||
357 | regulator-min-microvolt = <950000>; | ||
358 | regulator-max-microvolt = <1100000>; | ||
359 | regulator-always-on; | ||
360 | regulator-boot-on; | ||
361 | op_mode = <1>; /* Normal Mode */ | ||
362 | }; | ||
363 | |||
364 | buck2_reg: BUCK2 { | ||
365 | regulator-name = "vdd_arm"; | ||
366 | regulator-min-microvolt = <925000>; | ||
367 | regulator-max-microvolt = <1300000>; | ||
368 | regulator-always-on; | ||
369 | regulator-boot-on; | ||
370 | op_mode = <1>; /* Normal Mode */ | ||
371 | }; | ||
372 | |||
373 | buck3_reg: BUCK3 { | ||
374 | regulator-name = "vdd_int"; | ||
375 | regulator-min-microvolt = <900000>; | ||
376 | regulator-max-microvolt = <1200000>; | ||
377 | regulator-always-on; | ||
378 | regulator-boot-on; | ||
379 | op_mode = <1>; /* Normal Mode */ | ||
380 | }; | ||
381 | |||
382 | buck4_reg: BUCK4 { | ||
383 | regulator-name = "vdd_g3d"; | ||
384 | regulator-min-microvolt = <750000>; | ||
385 | regulator-max-microvolt = <1500000>; | ||
386 | regulator-always-on; | ||
387 | regulator-boot-on; | ||
388 | op_mode = <1>; /* Normal Mode */ | ||
389 | }; | ||
390 | |||
391 | buck5_reg: BUCK5 { | ||
392 | regulator-name = "vdd_m12"; | ||
393 | regulator-min-microvolt = <750000>; | ||
394 | regulator-max-microvolt = <1500000>; | ||
395 | regulator-always-on; | ||
396 | regulator-boot-on; | ||
397 | op_mode = <1>; /* Normal Mode */ | ||
398 | }; | ||
399 | |||
400 | buck6_reg: BUCK6 { | ||
401 | regulator-name = "vdd12_5m"; | ||
402 | regulator-min-microvolt = <750000>; | ||
403 | regulator-max-microvolt = <1500000>; | ||
404 | regulator-always-on; | ||
405 | regulator-boot-on; | ||
406 | op_mode = <1>; /* Normal Mode */ | ||
407 | }; | ||
408 | |||
409 | buck9_reg: BUCK9 { | ||
410 | regulator-name = "vddf28_emmc"; | ||
411 | regulator-min-microvolt = <750000>; | ||
412 | regulator-max-microvolt = <3000000>; | ||
413 | regulator-always-on; | ||
414 | regulator-boot-on; | ||
415 | op_mode = <1>; /* Normal Mode */ | ||
416 | }; | ||
417 | }; | ||
418 | }; | ||
419 | }; | ||
420 | |||
421 | fixed-rate-clocks { | ||
422 | xxti { | ||
423 | compatible = "samsung,clock-xxti"; | ||
424 | clock-frequency = <0>; | ||
425 | }; | ||
426 | |||
427 | xusbxti { | ||
428 | compatible = "samsung,clock-xusbxti"; | ||
429 | clock-frequency = <24000000>; | ||
430 | }; | ||
431 | }; | ||
432 | }; | ||
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index f05bf575cc45..874beeaef99d 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts | |||
@@ -27,6 +27,19 @@ | |||
27 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; | 27 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; |
28 | }; | 28 | }; |
29 | 29 | ||
30 | sdhci@12530000 { | ||
31 | bus-width = <4>; | ||
32 | pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; | ||
33 | pinctrl-names = "default"; | ||
34 | status = "okay"; | ||
35 | }; | ||
36 | |||
37 | codec@13400000 { | ||
38 | samsung,mfc-r = <0x43000000 0x800000>; | ||
39 | samsung,mfc-l = <0x51000000 0x800000>; | ||
40 | status = "okay"; | ||
41 | }; | ||
42 | |||
30 | serial@13800000 { | 43 | serial@13800000 { |
31 | status = "okay"; | 44 | status = "okay"; |
32 | }; | 45 | }; |
@@ -42,4 +55,16 @@ | |||
42 | serial@13830000 { | 55 | serial@13830000 { |
43 | status = "okay"; | 56 | status = "okay"; |
44 | }; | 57 | }; |
58 | |||
59 | fixed-rate-clocks { | ||
60 | xxti { | ||
61 | compatible = "samsung,clock-xxti"; | ||
62 | clock-frequency = <0>; | ||
63 | }; | ||
64 | |||
65 | xusbxti { | ||
66 | compatible = "samsung,clock-xusbxti"; | ||
67 | clock-frequency = <24000000>; | ||
68 | }; | ||
69 | }; | ||
45 | }; | 70 | }; |
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index d7dfe312772a..d75c047e80a9 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi | |||
@@ -25,4 +25,30 @@ | |||
25 | gic:interrupt-controller@10490000 { | 25 | gic:interrupt-controller@10490000 { |
26 | cpu-offset = <0x4000>; | 26 | cpu-offset = <0x4000>; |
27 | }; | 27 | }; |
28 | |||
29 | mct@10050000 { | ||
30 | compatible = "samsung,exynos4412-mct"; | ||
31 | reg = <0x10050000 0x800>; | ||
32 | interrupt-controller; | ||
33 | #interrups-cells = <2>; | ||
34 | interrupt-parent = <&mct_map>; | ||
35 | interrupts = <0 0>, <1 0>, <2 0>, <3 0>, | ||
36 | <4 0>, <5 0>, <6 0>, <7 0>; | ||
37 | clocks = <&clock 3>, <&clock 344>; | ||
38 | clock-names = "fin_pll", "mct"; | ||
39 | |||
40 | mct_map: mct-map { | ||
41 | #interrupt-cells = <2>; | ||
42 | #address-cells = <0>; | ||
43 | #size-cells = <0>; | ||
44 | interrupt-map = <0x0 0 &gic 0 57 0>, | ||
45 | <0x1 0 &combiner 12 5>, | ||
46 | <0x2 0 &combiner 12 6>, | ||
47 | <0x3 0 &combiner 12 7>, | ||
48 | <0x4 0 &gic 1 12 0>, | ||
49 | <0x5 0 &gic 1 12 0>, | ||
50 | <0x6 0 &gic 1 12 0>, | ||
51 | <0x7 0 &gic 1 12 0>; | ||
52 | }; | ||
53 | }; | ||
28 | }; | 54 | }; |
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 9a8780694909..7496b8d633ea 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi | |||
@@ -36,6 +36,12 @@ | |||
36 | <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; | 36 | <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | clock: clock-controller@0x10030000 { | ||
40 | compatible = "samsung,exynos4412-clock"; | ||
41 | reg = <0x10030000 0x20000>; | ||
42 | #clock-cells = <1>; | ||
43 | }; | ||
44 | |||
39 | pinctrl_0: pinctrl@11400000 { | 45 | pinctrl_0: pinctrl@11400000 { |
40 | compatible = "samsung,exynos4x12-pinctrl"; | 46 | compatible = "samsung,exynos4x12-pinctrl"; |
41 | reg = <0x11400000 0x1000>; | 47 | reg = <0x11400000 0x1000>; |
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts new file mode 100644 index 000000000000..5de019cb0e58 --- /dev/null +++ b/arch/arm/boot/dts/exynos5250-arndale.dts | |||
@@ -0,0 +1,129 @@ | |||
1 | /* | ||
2 | * Samsung's Exynos5250 based Arndale board device tree source | ||
3 | * | ||
4 | * Copyright (c) 2013 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | /dts-v1/; | ||
13 | /include/ "exynos5250.dtsi" | ||
14 | |||
15 | / { | ||
16 | model = "Insignal Arndale evaluation board based on EXYNOS5250"; | ||
17 | compatible = "insignal,arndale", "samsung,exynos5250"; | ||
18 | |||
19 | memory { | ||
20 | reg = <0x40000000 0x80000000>; | ||
21 | }; | ||
22 | |||
23 | chosen { | ||
24 | bootargs = "console=ttySAC2,115200"; | ||
25 | }; | ||
26 | |||
27 | i2c@12C60000 { | ||
28 | status = "disabled"; | ||
29 | }; | ||
30 | |||
31 | i2c@12C70000 { | ||
32 | status = "disabled"; | ||
33 | }; | ||
34 | |||
35 | i2c@12C80000 { | ||
36 | status = "disabled"; | ||
37 | }; | ||
38 | |||
39 | i2c@12C90000 { | ||
40 | status = "disabled"; | ||
41 | }; | ||
42 | |||
43 | i2c@12CA0000 { | ||
44 | status = "disabled"; | ||
45 | }; | ||
46 | |||
47 | i2c@12CB0000 { | ||
48 | status = "disabled"; | ||
49 | }; | ||
50 | |||
51 | i2c@12CC0000 { | ||
52 | status = "disabled"; | ||
53 | }; | ||
54 | |||
55 | i2c@12CD0000 { | ||
56 | status = "disabled"; | ||
57 | }; | ||
58 | |||
59 | i2c@121D0000 { | ||
60 | status = "disabled"; | ||
61 | }; | ||
62 | |||
63 | dwmmc_0: dwmmc0@12200000 { | ||
64 | num-slots = <1>; | ||
65 | supports-highspeed; | ||
66 | broken-cd; | ||
67 | fifo-depth = <0x80>; | ||
68 | card-detect-delay = <200>; | ||
69 | samsung,dw-mshc-ciu-div = <3>; | ||
70 | samsung,dw-mshc-sdr-timing = <2 3>; | ||
71 | samsung,dw-mshc-ddr-timing = <1 2>; | ||
72 | |||
73 | slot@0 { | ||
74 | reg = <0>; | ||
75 | bus-width = <8>; | ||
76 | gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>, | ||
77 | <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>, | ||
78 | <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>, | ||
79 | <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>, | ||
80 | <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>; | ||
81 | }; | ||
82 | }; | ||
83 | |||
84 | dwmmc_1: dwmmc1@12210000 { | ||
85 | status = "disabled"; | ||
86 | }; | ||
87 | |||
88 | dwmmc_2: dwmmc2@12220000 { | ||
89 | num-slots = <1>; | ||
90 | supports-highspeed; | ||
91 | fifo-depth = <0x80>; | ||
92 | card-detect-delay = <200>; | ||
93 | samsung,dw-mshc-ciu-div = <3>; | ||
94 | samsung,dw-mshc-sdr-timing = <2 3>; | ||
95 | samsung,dw-mshc-ddr-timing = <1 2>; | ||
96 | |||
97 | slot@0 { | ||
98 | reg = <0>; | ||
99 | bus-width = <4>; | ||
100 | samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>; | ||
101 | gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>, | ||
102 | <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>, | ||
103 | <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>; | ||
104 | }; | ||
105 | }; | ||
106 | |||
107 | dwmmc_3: dwmmc3@12230000 { | ||
108 | status = "disabled"; | ||
109 | }; | ||
110 | |||
111 | spi_0: spi@12d20000 { | ||
112 | status = "disabled"; | ||
113 | }; | ||
114 | |||
115 | spi_1: spi@12d30000 { | ||
116 | status = "disabled"; | ||
117 | }; | ||
118 | |||
119 | spi_2: spi@12d40000 { | ||
120 | status = "disabled"; | ||
121 | }; | ||
122 | |||
123 | fixed-rate-clocks { | ||
124 | xxti { | ||
125 | compatible = "samsung,clock-xxti"; | ||
126 | clock-frequency = <24000000>; | ||
127 | }; | ||
128 | }; | ||
129 | }; | ||
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 1b8d4106d338..872ae1f93c75 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
@@ -231,4 +231,24 @@ | |||
231 | samsung,i2s-controller = <&i2s0>; | 231 | samsung,i2s-controller = <&i2s0>; |
232 | samsung,audio-codec = <&wm8994>; | 232 | samsung,audio-codec = <&wm8994>; |
233 | }; | 233 | }; |
234 | |||
235 | usb@12110000 { | ||
236 | samsung,vbus-gpio = <&gpx2 6 1 3 3>; | ||
237 | }; | ||
238 | |||
239 | dp-controller { | ||
240 | samsung,color-space = <0>; | ||
241 | samsung,dynamic-range = <0>; | ||
242 | samsung,ycbcr-coeff = <0>; | ||
243 | samsung,color-depth = <1>; | ||
244 | samsung,link-rate = <0x0a>; | ||
245 | samsung,lane-count = <4>; | ||
246 | }; | ||
247 | |||
248 | fixed-rate-clocks { | ||
249 | xxti { | ||
250 | compatible = "samsung,clock-xxti"; | ||
251 | clock-frequency = <24000000>; | ||
252 | }; | ||
253 | }; | ||
234 | }; | 254 | }; |
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 17dd951c1cd2..babd9f9b1bf9 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts | |||
@@ -40,4 +40,15 @@ | |||
40 | <&gpc4 5 2 3 0>, <&gpc4 6 2 3 0>; | 40 | <&gpc4 5 2 3 0>, <&gpc4 6 2 3 0>; |
41 | }; | 41 | }; |
42 | }; | 42 | }; |
43 | |||
44 | usb@12110000 { | ||
45 | samsung,vbus-gpio = <&gpx1 1 1 3 3>; | ||
46 | }; | ||
47 | |||
48 | fixed-rate-clocks { | ||
49 | xxti { | ||
50 | compatible = "samsung,clock-xxti"; | ||
51 | clock-frequency = <24000000>; | ||
52 | }; | ||
53 | }; | ||
43 | }; | 54 | }; |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index b1ac73e21c80..28758e5dd15c 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -46,6 +46,22 @@ | |||
46 | i2c8 = &i2c_8; | 46 | i2c8 = &i2c_8; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | pd_gsc: gsc-power-domain@0x10044000 { | ||
50 | compatible = "samsung,exynos4210-pd"; | ||
51 | reg = <0x10044000 0x20>; | ||
52 | }; | ||
53 | |||
54 | pd_mfc: mfc-power-domain@0x10044040 { | ||
55 | compatible = "samsung,exynos4210-pd"; | ||
56 | reg = <0x10044040 0x20>; | ||
57 | }; | ||
58 | |||
59 | clock: clock-controller@0x10010000 { | ||
60 | compatible = "samsung,exynos5250-clock"; | ||
61 | reg = <0x10010000 0x30000>; | ||
62 | #clock-cells = <1>; | ||
63 | }; | ||
64 | |||
49 | gic:interrupt-controller@10481000 { | 65 | gic:interrupt-controller@10481000 { |
50 | compatible = "arm,cortex-a9-gic"; | 66 | compatible = "arm,cortex-a9-gic"; |
51 | #interrupt-cells = <3>; | 67 | #interrupt-cells = <3>; |
@@ -69,58 +85,106 @@ | |||
69 | <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; | 85 | <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; |
70 | }; | 86 | }; |
71 | 87 | ||
88 | mct@101C0000 { | ||
89 | compatible = "samsung,exynos4210-mct"; | ||
90 | reg = <0x101C0000 0x800>; | ||
91 | interrupt-controller; | ||
92 | #interrups-cells = <2>; | ||
93 | interrupt-parent = <&mct_map>; | ||
94 | interrupts = <0 0>, <1 0>, <2 0>, <3 0>, | ||
95 | <4 0>, <5 0>; | ||
96 | clocks = <&clock 1>, <&clock 335>; | ||
97 | clock-names = "fin_pll", "mct"; | ||
98 | |||
99 | mct_map: mct-map { | ||
100 | #interrupt-cells = <2>; | ||
101 | #address-cells = <0>; | ||
102 | #size-cells = <0>; | ||
103 | interrupt-map = <0x0 0 &combiner 23 3>, | ||
104 | <0x1 0 &combiner 23 4>, | ||
105 | <0x2 0 &combiner 25 2>, | ||
106 | <0x3 0 &combiner 25 3>, | ||
107 | <0x4 0 &gic 0 120 0>, | ||
108 | <0x5 0 &gic 0 121 0>; | ||
109 | }; | ||
110 | }; | ||
111 | |||
112 | pmu { | ||
113 | compatible = "arm,cortex-a15-pmu"; | ||
114 | interrupt-parent = <&combiner>; | ||
115 | interrupts = <1 2>, <22 4>; | ||
116 | }; | ||
117 | |||
72 | watchdog { | 118 | watchdog { |
73 | compatible = "samsung,s3c2410-wdt"; | 119 | compatible = "samsung,s3c2410-wdt"; |
74 | reg = <0x101D0000 0x100>; | 120 | reg = <0x101D0000 0x100>; |
75 | interrupts = <0 42 0>; | 121 | interrupts = <0 42 0>; |
122 | clocks = <&clock 336>; | ||
123 | clock-names = "watchdog"; | ||
76 | }; | 124 | }; |
77 | 125 | ||
78 | codec@11000000 { | 126 | codec@11000000 { |
79 | compatible = "samsung,mfc-v6"; | 127 | compatible = "samsung,mfc-v6"; |
80 | reg = <0x11000000 0x10000>; | 128 | reg = <0x11000000 0x10000>; |
81 | interrupts = <0 96 0>; | 129 | interrupts = <0 96 0>; |
130 | samsung,power-domain = <&pd_mfc>; | ||
82 | }; | 131 | }; |
83 | 132 | ||
84 | rtc { | 133 | rtc { |
85 | compatible = "samsung,s3c6410-rtc"; | 134 | compatible = "samsung,s3c6410-rtc"; |
86 | reg = <0x101E0000 0x100>; | 135 | reg = <0x101E0000 0x100>; |
87 | interrupts = <0 43 0>, <0 44 0>; | 136 | interrupts = <0 43 0>, <0 44 0>; |
137 | clocks = <&clock 337>; | ||
138 | clock-names = "rtc"; | ||
139 | status = "disabled"; | ||
88 | }; | 140 | }; |
89 | 141 | ||
90 | tmu@10060000 { | 142 | tmu@10060000 { |
91 | compatible = "samsung,exynos5250-tmu"; | 143 | compatible = "samsung,exynos5250-tmu"; |
92 | reg = <0x10060000 0x100>; | 144 | reg = <0x10060000 0x100>; |
93 | interrupts = <0 65 0>; | 145 | interrupts = <0 65 0>; |
146 | clocks = <&clock 338>; | ||
147 | clock-names = "tmu_apbif"; | ||
94 | }; | 148 | }; |
95 | 149 | ||
96 | serial@12C00000 { | 150 | serial@12C00000 { |
97 | compatible = "samsung,exynos4210-uart"; | 151 | compatible = "samsung,exynos4210-uart"; |
98 | reg = <0x12C00000 0x100>; | 152 | reg = <0x12C00000 0x100>; |
99 | interrupts = <0 51 0>; | 153 | interrupts = <0 51 0>; |
154 | clocks = <&clock 289>, <&clock 146>; | ||
155 | clock-names = "uart", "clk_uart_baud0"; | ||
100 | }; | 156 | }; |
101 | 157 | ||
102 | serial@12C10000 { | 158 | serial@12C10000 { |
103 | compatible = "samsung,exynos4210-uart"; | 159 | compatible = "samsung,exynos4210-uart"; |
104 | reg = <0x12C10000 0x100>; | 160 | reg = <0x12C10000 0x100>; |
105 | interrupts = <0 52 0>; | 161 | interrupts = <0 52 0>; |
162 | clocks = <&clock 290>, <&clock 147>; | ||
163 | clock-names = "uart", "clk_uart_baud0"; | ||
106 | }; | 164 | }; |
107 | 165 | ||
108 | serial@12C20000 { | 166 | serial@12C20000 { |
109 | compatible = "samsung,exynos4210-uart"; | 167 | compatible = "samsung,exynos4210-uart"; |
110 | reg = <0x12C20000 0x100>; | 168 | reg = <0x12C20000 0x100>; |
111 | interrupts = <0 53 0>; | 169 | interrupts = <0 53 0>; |
170 | clocks = <&clock 291>, <&clock 148>; | ||
171 | clock-names = "uart", "clk_uart_baud0"; | ||
112 | }; | 172 | }; |
113 | 173 | ||
114 | serial@12C30000 { | 174 | serial@12C30000 { |
115 | compatible = "samsung,exynos4210-uart"; | 175 | compatible = "samsung,exynos4210-uart"; |
116 | reg = <0x12C30000 0x100>; | 176 | reg = <0x12C30000 0x100>; |
117 | interrupts = <0 54 0>; | 177 | interrupts = <0 54 0>; |
178 | clocks = <&clock 292>, <&clock 149>; | ||
179 | clock-names = "uart", "clk_uart_baud0"; | ||
118 | }; | 180 | }; |
119 | 181 | ||
120 | sata@122F0000 { | 182 | sata@122F0000 { |
121 | compatible = "samsung,exynos5-sata-ahci"; | 183 | compatible = "samsung,exynos5-sata-ahci"; |
122 | reg = <0x122F0000 0x1ff>; | 184 | reg = <0x122F0000 0x1ff>; |
123 | interrupts = <0 115 0>; | 185 | interrupts = <0 115 0>; |
186 | clocks = <&clock 277>, <&clock 143>; | ||
187 | clock-names = "sata", "sclk_sata"; | ||
124 | }; | 188 | }; |
125 | 189 | ||
126 | sata-phy@12170000 { | 190 | sata-phy@12170000 { |
@@ -134,6 +198,8 @@ | |||
134 | interrupts = <0 56 0>; | 198 | interrupts = <0 56 0>; |
135 | #address-cells = <1>; | 199 | #address-cells = <1>; |
136 | #size-cells = <0>; | 200 | #size-cells = <0>; |
201 | clocks = <&clock 294>; | ||
202 | clock-names = "i2c"; | ||
137 | }; | 203 | }; |
138 | 204 | ||
139 | i2c_1: i2c@12C70000 { | 205 | i2c_1: i2c@12C70000 { |
@@ -142,6 +208,8 @@ | |||
142 | interrupts = <0 57 0>; | 208 | interrupts = <0 57 0>; |
143 | #address-cells = <1>; | 209 | #address-cells = <1>; |
144 | #size-cells = <0>; | 210 | #size-cells = <0>; |
211 | clocks = <&clock 295>; | ||
212 | clock-names = "i2c"; | ||
145 | }; | 213 | }; |
146 | 214 | ||
147 | i2c_2: i2c@12C80000 { | 215 | i2c_2: i2c@12C80000 { |
@@ -150,6 +218,8 @@ | |||
150 | interrupts = <0 58 0>; | 218 | interrupts = <0 58 0>; |
151 | #address-cells = <1>; | 219 | #address-cells = <1>; |
152 | #size-cells = <0>; | 220 | #size-cells = <0>; |
221 | clocks = <&clock 296>; | ||
222 | clock-names = "i2c"; | ||
153 | }; | 223 | }; |
154 | 224 | ||
155 | i2c_3: i2c@12C90000 { | 225 | i2c_3: i2c@12C90000 { |
@@ -158,6 +228,8 @@ | |||
158 | interrupts = <0 59 0>; | 228 | interrupts = <0 59 0>; |
159 | #address-cells = <1>; | 229 | #address-cells = <1>; |
160 | #size-cells = <0>; | 230 | #size-cells = <0>; |
231 | clocks = <&clock 297>; | ||
232 | clock-names = "i2c"; | ||
161 | }; | 233 | }; |
162 | 234 | ||
163 | i2c_4: i2c@12CA0000 { | 235 | i2c_4: i2c@12CA0000 { |
@@ -166,6 +238,8 @@ | |||
166 | interrupts = <0 60 0>; | 238 | interrupts = <0 60 0>; |
167 | #address-cells = <1>; | 239 | #address-cells = <1>; |
168 | #size-cells = <0>; | 240 | #size-cells = <0>; |
241 | clocks = <&clock 298>; | ||
242 | clock-names = "i2c"; | ||
169 | }; | 243 | }; |
170 | 244 | ||
171 | i2c_5: i2c@12CB0000 { | 245 | i2c_5: i2c@12CB0000 { |
@@ -174,6 +248,8 @@ | |||
174 | interrupts = <0 61 0>; | 248 | interrupts = <0 61 0>; |
175 | #address-cells = <1>; | 249 | #address-cells = <1>; |
176 | #size-cells = <0>; | 250 | #size-cells = <0>; |
251 | clocks = <&clock 299>; | ||
252 | clock-names = "i2c"; | ||
177 | }; | 253 | }; |
178 | 254 | ||
179 | i2c_6: i2c@12CC0000 { | 255 | i2c_6: i2c@12CC0000 { |
@@ -182,6 +258,8 @@ | |||
182 | interrupts = <0 62 0>; | 258 | interrupts = <0 62 0>; |
183 | #address-cells = <1>; | 259 | #address-cells = <1>; |
184 | #size-cells = <0>; | 260 | #size-cells = <0>; |
261 | clocks = <&clock 300>; | ||
262 | clock-names = "i2c"; | ||
185 | }; | 263 | }; |
186 | 264 | ||
187 | i2c_7: i2c@12CD0000 { | 265 | i2c_7: i2c@12CD0000 { |
@@ -190,6 +268,8 @@ | |||
190 | interrupts = <0 63 0>; | 268 | interrupts = <0 63 0>; |
191 | #address-cells = <1>; | 269 | #address-cells = <1>; |
192 | #size-cells = <0>; | 270 | #size-cells = <0>; |
271 | clocks = <&clock 301>; | ||
272 | clock-names = "i2c"; | ||
193 | }; | 273 | }; |
194 | 274 | ||
195 | i2c_8: i2c@12CE0000 { | 275 | i2c_8: i2c@12CE0000 { |
@@ -198,6 +278,8 @@ | |||
198 | interrupts = <0 64 0>; | 278 | interrupts = <0 64 0>; |
199 | #address-cells = <1>; | 279 | #address-cells = <1>; |
200 | #size-cells = <0>; | 280 | #size-cells = <0>; |
281 | clocks = <&clock 302>; | ||
282 | clock-names = "i2c"; | ||
201 | }; | 283 | }; |
202 | 284 | ||
203 | i2c@121D0000 { | 285 | i2c@121D0000 { |
@@ -205,6 +287,8 @@ | |||
205 | reg = <0x121D0000 0x100>; | 287 | reg = <0x121D0000 0x100>; |
206 | #address-cells = <1>; | 288 | #address-cells = <1>; |
207 | #size-cells = <0>; | 289 | #size-cells = <0>; |
290 | clocks = <&clock 288>; | ||
291 | clock-names = "i2c"; | ||
208 | }; | 292 | }; |
209 | 293 | ||
210 | spi_0: spi@12d20000 { | 294 | spi_0: spi@12d20000 { |
@@ -216,6 +300,8 @@ | |||
216 | dma-names = "tx", "rx"; | 300 | dma-names = "tx", "rx"; |
217 | #address-cells = <1>; | 301 | #address-cells = <1>; |
218 | #size-cells = <0>; | 302 | #size-cells = <0>; |
303 | clocks = <&clock 304>, <&clock 154>; | ||
304 | clock-names = "spi", "spi_busclk0"; | ||
219 | }; | 305 | }; |
220 | 306 | ||
221 | spi_1: spi@12d30000 { | 307 | spi_1: spi@12d30000 { |
@@ -227,6 +313,8 @@ | |||
227 | dma-names = "tx", "rx"; | 313 | dma-names = "tx", "rx"; |
228 | #address-cells = <1>; | 314 | #address-cells = <1>; |
229 | #size-cells = <0>; | 315 | #size-cells = <0>; |
316 | clocks = <&clock 305>, <&clock 155>; | ||
317 | clock-names = "spi", "spi_busclk0"; | ||
230 | }; | 318 | }; |
231 | 319 | ||
232 | spi_2: spi@12d40000 { | 320 | spi_2: spi@12d40000 { |
@@ -238,6 +326,8 @@ | |||
238 | dma-names = "tx", "rx"; | 326 | dma-names = "tx", "rx"; |
239 | #address-cells = <1>; | 327 | #address-cells = <1>; |
240 | #size-cells = <0>; | 328 | #size-cells = <0>; |
329 | clocks = <&clock 306>, <&clock 156>; | ||
330 | clock-names = "spi", "spi_busclk0"; | ||
241 | }; | 331 | }; |
242 | 332 | ||
243 | dwmmc_0: dwmmc0@12200000 { | 333 | dwmmc_0: dwmmc0@12200000 { |
@@ -246,6 +336,8 @@ | |||
246 | interrupts = <0 75 0>; | 336 | interrupts = <0 75 0>; |
247 | #address-cells = <1>; | 337 | #address-cells = <1>; |
248 | #size-cells = <0>; | 338 | #size-cells = <0>; |
339 | clocks = <&clock 280>, <&clock 139>; | ||
340 | clock-names = "biu", "ciu"; | ||
249 | }; | 341 | }; |
250 | 342 | ||
251 | dwmmc_1: dwmmc1@12210000 { | 343 | dwmmc_1: dwmmc1@12210000 { |
@@ -254,6 +346,8 @@ | |||
254 | interrupts = <0 76 0>; | 346 | interrupts = <0 76 0>; |
255 | #address-cells = <1>; | 347 | #address-cells = <1>; |
256 | #size-cells = <0>; | 348 | #size-cells = <0>; |
349 | clocks = <&clock 281>, <&clock 140>; | ||
350 | clock-names = "biu", "ciu"; | ||
257 | }; | 351 | }; |
258 | 352 | ||
259 | dwmmc_2: dwmmc2@12220000 { | 353 | dwmmc_2: dwmmc2@12220000 { |
@@ -262,6 +356,8 @@ | |||
262 | interrupts = <0 77 0>; | 356 | interrupts = <0 77 0>; |
263 | #address-cells = <1>; | 357 | #address-cells = <1>; |
264 | #size-cells = <0>; | 358 | #size-cells = <0>; |
359 | clocks = <&clock 282>, <&clock 141>; | ||
360 | clock-names = "biu", "ciu"; | ||
265 | }; | 361 | }; |
266 | 362 | ||
267 | dwmmc_3: dwmmc3@12230000 { | 363 | dwmmc_3: dwmmc3@12230000 { |
@@ -270,6 +366,8 @@ | |||
270 | interrupts = <0 78 0>; | 366 | interrupts = <0 78 0>; |
271 | #address-cells = <1>; | 367 | #address-cells = <1>; |
272 | #size-cells = <0>; | 368 | #size-cells = <0>; |
369 | clocks = <&clock 283>, <&clock 142>; | ||
370 | clock-names = "biu", "ciu"; | ||
273 | }; | 371 | }; |
274 | 372 | ||
275 | i2s0: i2s@03830000 { | 373 | i2s0: i2s@03830000 { |
@@ -301,6 +399,18 @@ | |||
301 | dma-names = "tx", "rx"; | 399 | dma-names = "tx", "rx"; |
302 | }; | 400 | }; |
303 | 401 | ||
402 | usb@12110000 { | ||
403 | compatible = "samsung,exynos4210-ehci"; | ||
404 | reg = <0x12110000 0x100>; | ||
405 | interrupts = <0 71 0>; | ||
406 | }; | ||
407 | |||
408 | usb@12120000 { | ||
409 | compatible = "samsung,exynos4210-ohci"; | ||
410 | reg = <0x12120000 0x100>; | ||
411 | interrupts = <0 71 0>; | ||
412 | }; | ||
413 | |||
304 | amba { | 414 | amba { |
305 | #address-cells = <1>; | 415 | #address-cells = <1>; |
306 | #size-cells = <1>; | 416 | #size-cells = <1>; |
@@ -312,6 +422,8 @@ | |||
312 | compatible = "arm,pl330", "arm,primecell"; | 422 | compatible = "arm,pl330", "arm,primecell"; |
313 | reg = <0x121A0000 0x1000>; | 423 | reg = <0x121A0000 0x1000>; |
314 | interrupts = <0 34 0>; | 424 | interrupts = <0 34 0>; |
425 | clocks = <&clock 275>; | ||
426 | clock-names = "apb_pclk"; | ||
315 | #dma-cells = <1>; | 427 | #dma-cells = <1>; |
316 | #dma-channels = <8>; | 428 | #dma-channels = <8>; |
317 | #dma-requests = <32>; | 429 | #dma-requests = <32>; |
@@ -321,6 +433,8 @@ | |||
321 | compatible = "arm,pl330", "arm,primecell"; | 433 | compatible = "arm,pl330", "arm,primecell"; |
322 | reg = <0x121B0000 0x1000>; | 434 | reg = <0x121B0000 0x1000>; |
323 | interrupts = <0 35 0>; | 435 | interrupts = <0 35 0>; |
436 | clocks = <&clock 276>; | ||
437 | clock-names = "apb_pclk"; | ||
324 | #dma-cells = <1>; | 438 | #dma-cells = <1>; |
325 | #dma-channels = <8>; | 439 | #dma-channels = <8>; |
326 | #dma-requests = <32>; | 440 | #dma-requests = <32>; |
@@ -330,6 +444,8 @@ | |||
330 | compatible = "arm,pl330", "arm,primecell"; | 444 | compatible = "arm,pl330", "arm,primecell"; |
331 | reg = <0x10800000 0x1000>; | 445 | reg = <0x10800000 0x1000>; |
332 | interrupts = <0 33 0>; | 446 | interrupts = <0 33 0>; |
447 | clocks = <&clock 271>; | ||
448 | clock-names = "apb_pclk"; | ||
333 | #dma-cells = <1>; | 449 | #dma-cells = <1>; |
334 | #dma-channels = <8>; | 450 | #dma-channels = <8>; |
335 | #dma-requests = <1>; | 451 | #dma-requests = <1>; |
@@ -339,6 +455,8 @@ | |||
339 | compatible = "arm,pl330", "arm,primecell"; | 455 | compatible = "arm,pl330", "arm,primecell"; |
340 | reg = <0x11C10000 0x1000>; | 456 | reg = <0x11C10000 0x1000>; |
341 | interrupts = <0 124 0>; | 457 | interrupts = <0 124 0>; |
458 | clocks = <&clock 271>; | ||
459 | clock-names = "apb_pclk"; | ||
342 | #dma-cells = <1>; | 460 | #dma-cells = <1>; |
343 | #dma-channels = <8>; | 461 | #dma-channels = <8>; |
344 | #dma-requests = <1>; | 462 | #dma-requests = <1>; |
@@ -592,34 +710,51 @@ | |||
592 | }; | 710 | }; |
593 | }; | 711 | }; |
594 | 712 | ||
713 | |||
595 | gsc_0: gsc@0x13e00000 { | 714 | gsc_0: gsc@0x13e00000 { |
596 | compatible = "samsung,exynos5-gsc"; | 715 | compatible = "samsung,exynos5-gsc"; |
597 | reg = <0x13e00000 0x1000>; | 716 | reg = <0x13e00000 0x1000>; |
598 | interrupts = <0 85 0>; | 717 | interrupts = <0 85 0>; |
718 | samsung,power-domain = <&pd_gsc>; | ||
719 | clocks = <&clock 256>; | ||
720 | clock-names = "gscl"; | ||
599 | }; | 721 | }; |
600 | 722 | ||
601 | gsc_1: gsc@0x13e10000 { | 723 | gsc_1: gsc@0x13e10000 { |
602 | compatible = "samsung,exynos5-gsc"; | 724 | compatible = "samsung,exynos5-gsc"; |
603 | reg = <0x13e10000 0x1000>; | 725 | reg = <0x13e10000 0x1000>; |
604 | interrupts = <0 86 0>; | 726 | interrupts = <0 86 0>; |
727 | samsung,power-domain = <&pd_gsc>; | ||
728 | clocks = <&clock 257>; | ||
729 | clock-names = "gscl"; | ||
605 | }; | 730 | }; |
606 | 731 | ||
607 | gsc_2: gsc@0x13e20000 { | 732 | gsc_2: gsc@0x13e20000 { |
608 | compatible = "samsung,exynos5-gsc"; | 733 | compatible = "samsung,exynos5-gsc"; |
609 | reg = <0x13e20000 0x1000>; | 734 | reg = <0x13e20000 0x1000>; |
610 | interrupts = <0 87 0>; | 735 | interrupts = <0 87 0>; |
736 | samsung,power-domain = <&pd_gsc>; | ||
737 | clocks = <&clock 258>; | ||
738 | clock-names = "gscl"; | ||
611 | }; | 739 | }; |
612 | 740 | ||
613 | gsc_3: gsc@0x13e30000 { | 741 | gsc_3: gsc@0x13e30000 { |
614 | compatible = "samsung,exynos5-gsc"; | 742 | compatible = "samsung,exynos5-gsc"; |
615 | reg = <0x13e30000 0x1000>; | 743 | reg = <0x13e30000 0x1000>; |
616 | interrupts = <0 88 0>; | 744 | interrupts = <0 88 0>; |
745 | samsung,power-domain = <&pd_gsc>; | ||
746 | clocks = <&clock 259>; | ||
747 | clock-names = "gscl"; | ||
617 | }; | 748 | }; |
618 | 749 | ||
619 | hdmi { | 750 | hdmi { |
620 | compatible = "samsung,exynos5-hdmi"; | 751 | compatible = "samsung,exynos5-hdmi"; |
621 | reg = <0x14530000 0x70000>; | 752 | reg = <0x14530000 0x70000>; |
622 | interrupts = <0 95 0>; | 753 | interrupts = <0 95 0>; |
754 | clocks = <&clock 333>, <&clock 136>, <&clock 137>, | ||
755 | <&clock 333>, <&clock 333>; | ||
756 | clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", | ||
757 | "sclk_hdmiphy", "hdmiphy"; | ||
623 | }; | 758 | }; |
624 | 759 | ||
625 | mixer { | 760 | mixer { |
@@ -627,4 +762,18 @@ | |||
627 | reg = <0x14450000 0x10000>; | 762 | reg = <0x14450000 0x10000>; |
628 | interrupts = <0 94 0>; | 763 | interrupts = <0 94 0>; |
629 | }; | 764 | }; |
765 | |||
766 | dp-controller { | ||
767 | compatible = "samsung,exynos5-dp"; | ||
768 | reg = <0x145b0000 0x1000>; | ||
769 | interrupts = <10 3>; | ||
770 | interrupt-parent = <&combiner>; | ||
771 | #address-cells = <1>; | ||
772 | #size-cells = <0>; | ||
773 | |||
774 | dptx-phy { | ||
775 | reg = <0x10040720>; | ||
776 | samsung,enable-mask = <1>; | ||
777 | }; | ||
778 | }; | ||
630 | }; | 779 | }; |
diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts index 81e2c964a900..a21eb4cbe893 100644 --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts | |||
@@ -28,19 +28,10 @@ | |||
28 | status = "disabled"; | 28 | status = "disabled"; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | i2c@F0000 { | 31 | fixed-rate-clocks { |
32 | status = "disabled"; | 32 | xtal { |
33 | }; | 33 | compatible = "samsung,clock-xtal"; |
34 | 34 | clock-frequency = <50000000>; | |
35 | i2c@100000 { | 35 | }; |
36 | status = "disabled"; | ||
37 | }; | ||
38 | |||
39 | watchdog { | ||
40 | status = "disabled"; | ||
41 | }; | ||
42 | |||
43 | rtc { | ||
44 | status = "disabled"; | ||
45 | }; | 36 | }; |
46 | }; | 37 | }; |
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi index 9a99755920c0..48cc96aa0b5f 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi | |||
@@ -16,6 +16,12 @@ | |||
16 | 16 | ||
17 | interrupt-parent = <&gic>; | 17 | interrupt-parent = <&gic>; |
18 | 18 | ||
19 | clock: clock-controller@0x160000 { | ||
20 | compatible = "samsung,exynos5440-clock"; | ||
21 | reg = <0x160000 0x1000>; | ||
22 | #clock-cells = <1>; | ||
23 | }; | ||
24 | |||
19 | gic:interrupt-controller@2E0000 { | 25 | gic:interrupt-controller@2E0000 { |
20 | compatible = "arm,cortex-a15-gic"; | 26 | compatible = "arm,cortex-a15-gic"; |
21 | #interrupt-cells = <3>; | 27 | #interrupt-cells = <3>; |
@@ -24,55 +30,51 @@ | |||
24 | }; | 30 | }; |
25 | 31 | ||
26 | cpus { | 32 | cpus { |
33 | #address-cells = <1>; | ||
34 | #size-cells = <0>; | ||
35 | |||
27 | cpu@0 { | 36 | cpu@0 { |
28 | compatible = "arm,cortex-a15"; | 37 | compatible = "arm,cortex-a15"; |
29 | timer { | 38 | reg = <0>; |
30 | compatible = "arm,armv7-timer"; | ||
31 | interrupts = <1 13 0xf08>; | ||
32 | clock-frequency = <1000000>; | ||
33 | }; | ||
34 | }; | 39 | }; |
35 | cpu@1 { | 40 | cpu@1 { |
36 | compatible = "arm,cortex-a15"; | 41 | compatible = "arm,cortex-a15"; |
37 | timer { | 42 | reg = <1>; |
38 | compatible = "arm,armv7-timer"; | ||
39 | interrupts = <1 14 0xf08>; | ||
40 | clock-frequency = <1000000>; | ||
41 | }; | ||
42 | }; | 43 | }; |
43 | cpu@2 { | 44 | cpu@2 { |
44 | compatible = "arm,cortex-a15"; | 45 | compatible = "arm,cortex-a15"; |
45 | timer { | 46 | reg = <2>; |
46 | compatible = "arm,armv7-timer"; | ||
47 | interrupts = <1 14 0xf08>; | ||
48 | clock-frequency = <1000000>; | ||
49 | }; | ||
50 | }; | 47 | }; |
51 | cpu@3 { | 48 | cpu@3 { |
52 | compatible = "arm,cortex-a15"; | 49 | compatible = "arm,cortex-a15"; |
53 | timer { | 50 | reg = <3>; |
54 | compatible = "arm,armv7-timer"; | ||
55 | interrupts = <1 14 0xf08>; | ||
56 | clock-frequency = <1000000>; | ||
57 | }; | ||
58 | }; | 51 | }; |
59 | }; | 52 | }; |
60 | 53 | ||
61 | common { | 54 | timer { |
62 | compatible = "samsung,exynos5440"; | 55 | compatible = "arm,cortex-a15-timer", |
63 | 56 | "arm,armv7-timer"; | |
57 | interrupts = <1 13 0xf08>, | ||
58 | <1 14 0xf08>, | ||
59 | <1 11 0xf08>, | ||
60 | <1 10 0xf08>; | ||
61 | clock-frequency = <50000000>; | ||
64 | }; | 62 | }; |
65 | 63 | ||
66 | serial@B0000 { | 64 | serial@B0000 { |
67 | compatible = "samsung,exynos4210-uart"; | 65 | compatible = "samsung,exynos4210-uart"; |
68 | reg = <0xB0000 0x1000>; | 66 | reg = <0xB0000 0x1000>; |
69 | interrupts = <0 2 0>; | 67 | interrupts = <0 2 0>; |
68 | clocks = <&clock 21>, <&clock 21>; | ||
69 | clock-names = "uart", "clk_uart_baud0"; | ||
70 | }; | 70 | }; |
71 | 71 | ||
72 | serial@C0000 { | 72 | serial@C0000 { |
73 | compatible = "samsung,exynos4210-uart"; | 73 | compatible = "samsung,exynos4210-uart"; |
74 | reg = <0xC0000 0x1000>; | 74 | reg = <0xC0000 0x1000>; |
75 | interrupts = <0 3 0>; | 75 | interrupts = <0 3 0>; |
76 | clocks = <&clock 21>, <&clock 21>; | ||
77 | clock-names = "uart", "clk_uart_baud0"; | ||
76 | }; | 78 | }; |
77 | 79 | ||
78 | spi { | 80 | spi { |
@@ -83,6 +85,8 @@ | |||
83 | rx-dma-channel = <&pdma0 4>; /* preliminary */ | 85 | rx-dma-channel = <&pdma0 4>; /* preliminary */ |
84 | #address-cells = <1>; | 86 | #address-cells = <1>; |
85 | #size-cells = <0>; | 87 | #size-cells = <0>; |
88 | clocks = <&clock 21>, <&clock 16>; | ||
89 | clock-names = "spi", "spi_busclk0"; | ||
86 | }; | 90 | }; |
87 | 91 | ||
88 | pinctrl { | 92 | pinctrl { |
@@ -110,25 +114,31 @@ | |||
110 | }; | 114 | }; |
111 | 115 | ||
112 | i2c@F0000 { | 116 | i2c@F0000 { |
113 | compatible = "samsung,s3c2440-i2c"; | 117 | compatible = "samsung,exynos5440-i2c"; |
114 | reg = <0xF0000 0x1000>; | 118 | reg = <0xF0000 0x1000>; |
115 | interrupts = <0 5 0>; | 119 | interrupts = <0 5 0>; |
116 | #address-cells = <1>; | 120 | #address-cells = <1>; |
117 | #size-cells = <0>; | 121 | #size-cells = <0>; |
122 | clocks = <&clock 21>; | ||
123 | clock-names = "i2c"; | ||
118 | }; | 124 | }; |
119 | 125 | ||
120 | i2c@100000 { | 126 | i2c@100000 { |
121 | compatible = "samsung,s3c2440-i2c"; | 127 | compatible = "samsung,exynos5440-i2c"; |
122 | reg = <0x100000 0x1000>; | 128 | reg = <0x100000 0x1000>; |
123 | interrupts = <0 6 0>; | 129 | interrupts = <0 6 0>; |
124 | #address-cells = <1>; | 130 | #address-cells = <1>; |
125 | #size-cells = <0>; | 131 | #size-cells = <0>; |
132 | clocks = <&clock 21>; | ||
133 | clock-names = "i2c"; | ||
126 | }; | 134 | }; |
127 | 135 | ||
128 | watchdog { | 136 | watchdog { |
129 | compatible = "samsung,s3c2410-wdt"; | 137 | compatible = "samsung,s3c2410-wdt"; |
130 | reg = <0x110000 0x1000>; | 138 | reg = <0x110000 0x1000>; |
131 | interrupts = <0 1 0>; | 139 | interrupts = <0 1 0>; |
140 | clocks = <&clock 21>; | ||
141 | clock-names = "watchdog"; | ||
132 | }; | 142 | }; |
133 | 143 | ||
134 | amba { | 144 | amba { |
@@ -142,6 +152,8 @@ | |||
142 | compatible = "arm,pl330", "arm,primecell"; | 152 | compatible = "arm,pl330", "arm,primecell"; |
143 | reg = <0x120000 0x1000>; | 153 | reg = <0x120000 0x1000>; |
144 | interrupts = <0 34 0>; | 154 | interrupts = <0 34 0>; |
155 | clocks = <&clock 21>; | ||
156 | clock-names = "apb_pclk"; | ||
145 | #dma-cells = <1>; | 157 | #dma-cells = <1>; |
146 | #dma-channels = <8>; | 158 | #dma-channels = <8>; |
147 | #dma-requests = <32>; | 159 | #dma-requests = <32>; |
@@ -151,6 +163,8 @@ | |||
151 | compatible = "arm,pl330", "arm,primecell"; | 163 | compatible = "arm,pl330", "arm,primecell"; |
152 | reg = <0x121000 0x1000>; | 164 | reg = <0x121000 0x1000>; |
153 | interrupts = <0 35 0>; | 165 | interrupts = <0 35 0>; |
166 | clocks = <&clock 21>; | ||
167 | clock-names = "apb_pclk"; | ||
154 | #dma-cells = <1>; | 168 | #dma-cells = <1>; |
155 | #dma-channels = <8>; | 169 | #dma-channels = <8>; |
156 | #dma-requests = <32>; | 170 | #dma-requests = <32>; |
@@ -161,5 +175,8 @@ | |||
161 | compatible = "samsung,s3c6410-rtc"; | 175 | compatible = "samsung,s3c6410-rtc"; |
162 | reg = <0x130000 0x1000>; | 176 | reg = <0x130000 0x1000>; |
163 | interrupts = <0 17 0>, <0 16 0>; | 177 | interrupts = <0 17 0>, <0 16 0>; |
178 | clocks = <&clock 21>; | ||
179 | clock-names = "rtc"; | ||
180 | status = "disabled"; | ||
164 | }; | 181 | }; |
165 | }; | 182 | }; |
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index f624dc85d441..02d23f15fd86 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts | |||
@@ -38,6 +38,57 @@ | |||
38 | }; | 38 | }; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | /* HS USB Port 2 RESET */ | ||
42 | hsusb2_reset: hsusb2_reset_reg { | ||
43 | compatible = "regulator-fixed"; | ||
44 | regulator-name = "hsusb2_reset"; | ||
45 | regulator-min-microvolt = <3300000>; | ||
46 | regulator-max-microvolt = <3300000>; | ||
47 | gpio = <&gpio5 19 0>; /* gpio_147 */ | ||
48 | startup-delay-us = <70000>; | ||
49 | enable-active-high; | ||
50 | }; | ||
51 | |||
52 | /* HS USB Port 2 Power */ | ||
53 | hsusb2_power: hsusb2_power_reg { | ||
54 | compatible = "regulator-fixed"; | ||
55 | regulator-name = "hsusb2_vbus"; | ||
56 | regulator-min-microvolt = <3300000>; | ||
57 | regulator-max-microvolt = <3300000>; | ||
58 | gpio = <&twl_gpio 18 0>; /* GPIO LEDA */ | ||
59 | startup-delay-us = <70000>; | ||
60 | }; | ||
61 | |||
62 | /* HS USB Host PHY on PORT 2 */ | ||
63 | hsusb2_phy: hsusb2_phy { | ||
64 | compatible = "usb-nop-xceiv"; | ||
65 | reset-supply = <&hsusb2_reset>; | ||
66 | vcc-supply = <&hsusb2_power>; | ||
67 | }; | ||
68 | }; | ||
69 | |||
70 | &omap3_pmx_core { | ||
71 | pinctrl-names = "default"; | ||
72 | pinctrl-0 = < | ||
73 | &hsusbb2_pins | ||
74 | >; | ||
75 | |||
76 | hsusbb2_pins: pinmux_hsusbb2_pins { | ||
77 | pinctrl-single,pins = < | ||
78 | 0x5c0 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */ | ||
79 | 0x5c2 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */ | ||
80 | 0x5c4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */ | ||
81 | 0x5c6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */ | ||
82 | 0x5c8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */ | ||
83 | 0x5cA 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */ | ||
84 | 0x1a4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */ | ||
85 | 0x1a6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */ | ||
86 | 0x1a8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */ | ||
87 | 0x1aa 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */ | ||
88 | 0x1ac 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */ | ||
89 | 0x1ae 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */ | ||
90 | >; | ||
91 | }; | ||
41 | }; | 92 | }; |
42 | 93 | ||
43 | &i2c1 { | 94 | &i2c1 { |
@@ -65,3 +116,23 @@ | |||
65 | &mmc3 { | 116 | &mmc3 { |
66 | status = "disabled"; | 117 | status = "disabled"; |
67 | }; | 118 | }; |
119 | |||
120 | &usbhshost { | ||
121 | port2-mode = "ehci-phy"; | ||
122 | }; | ||
123 | |||
124 | &usbhsehci { | ||
125 | phys = <0 &hsusb2_phy>; | ||
126 | }; | ||
127 | |||
128 | &twl_gpio { | ||
129 | ti,use-leds; | ||
130 | /* pullups: BIT(1) */ | ||
131 | ti,pullups = <0x000002>; | ||
132 | /* | ||
133 | * pulldowns: | ||
134 | * BIT(2), BIT(6), BIT(7), BIT(8), BIT(13) | ||
135 | * BIT(15), BIT(16), BIT(17) | ||
136 | */ | ||
137 | ti,pulldowns = <0x03a1c4>; | ||
138 | }; | ||
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 1acc26148ffc..a14f74bbce7c 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -397,5 +397,36 @@ | |||
397 | ti,timer-alwon; | 397 | ti,timer-alwon; |
398 | ti,timer-secure; | 398 | ti,timer-secure; |
399 | }; | 399 | }; |
400 | |||
401 | usbhstll: usbhstll@48062000 { | ||
402 | compatible = "ti,usbhs-tll"; | ||
403 | reg = <0x48062000 0x1000>; | ||
404 | interrupts = <78>; | ||
405 | ti,hwmods = "usb_tll_hs"; | ||
406 | }; | ||
407 | |||
408 | usbhshost: usbhshost@48064000 { | ||
409 | compatible = "ti,usbhs-host"; | ||
410 | reg = <0x48064000 0x400>; | ||
411 | ti,hwmods = "usb_host_hs"; | ||
412 | #address-cells = <1>; | ||
413 | #size-cells = <1>; | ||
414 | ranges; | ||
415 | |||
416 | usbhsohci: ohci@48064400 { | ||
417 | compatible = "ti,ohci-omap3", "usb-ohci"; | ||
418 | reg = <0x48064400 0x400>; | ||
419 | interrupt-parent = <&intc>; | ||
420 | interrupts = <76>; | ||
421 | }; | ||
422 | |||
423 | usbhsehci: ehci@48064800 { | ||
424 | compatible = "ti,ehci-omap", "usb-ehci"; | ||
425 | reg = <0x48064800 0x400>; | ||
426 | interrupt-parent = <&intc>; | ||
427 | interrupts = <77>; | ||
428 | }; | ||
429 | }; | ||
430 | |||
400 | }; | 431 | }; |
401 | }; | 432 | }; |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 739bb79e410e..b7db1a2b6ca7 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -529,5 +529,35 @@ | |||
529 | ti,hwmods = "timer11"; | 529 | ti,hwmods = "timer11"; |
530 | ti,timer-pwm; | 530 | ti,timer-pwm; |
531 | }; | 531 | }; |
532 | |||
533 | usbhstll: usbhstll@4a062000 { | ||
534 | compatible = "ti,usbhs-tll"; | ||
535 | reg = <0x4a062000 0x1000>; | ||
536 | interrupts = <0 78 0x4>; | ||
537 | ti,hwmods = "usb_tll_hs"; | ||
538 | }; | ||
539 | |||
540 | usbhshost: usbhshost@4a064000 { | ||
541 | compatible = "ti,usbhs-host"; | ||
542 | reg = <0x4a064000 0x800>; | ||
543 | ti,hwmods = "usb_host_hs"; | ||
544 | #address-cells = <1>; | ||
545 | #size-cells = <1>; | ||
546 | ranges; | ||
547 | |||
548 | usbhsohci: ohci@4a064800 { | ||
549 | compatible = "ti,ohci-omap3", "usb-ohci"; | ||
550 | reg = <0x4a064800 0x400>; | ||
551 | interrupt-parent = <&gic>; | ||
552 | interrupts = <0 76 0x4>; | ||
553 | }; | ||
554 | |||
555 | usbhsehci: ehci@4a064c00 { | ||
556 | compatible = "ti,ehci-omap", "usb-ehci"; | ||
557 | reg = <0x4a064c00 0x400>; | ||
558 | interrupt-parent = <&gic>; | ||
559 | interrupts = <0 77 0x4>; | ||
560 | }; | ||
561 | }; | ||
532 | }; | 562 | }; |
533 | }; | 563 | }; |
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 6ebc1b704190..616990dc92db 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | serial@70006300 { | 13 | serial@70006300 { |
14 | status = "okay"; | 14 | status = "okay"; |
15 | clock-frequency = <408000000>; | ||
16 | }; | 15 | }; |
17 | 16 | ||
18 | pmc { | 17 | pmc { |
diff --git a/arch/arm/boot/dts/tegra114-pluto.dts b/arch/arm/boot/dts/tegra114-pluto.dts index 5deb8692b350..6bbc8efae9c0 100644 --- a/arch/arm/boot/dts/tegra114-pluto.dts +++ b/arch/arm/boot/dts/tegra114-pluto.dts | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | serial@70006300 { | 13 | serial@70006300 { |
14 | status = "okay"; | 14 | status = "okay"; |
15 | clock-frequency = <408000000>; | ||
16 | }; | 15 | }; |
17 | 16 | ||
18 | pmc { | 17 | pmc { |
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index c0b527d15fda..c1110a9b2a91 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi | |||
@@ -24,10 +24,11 @@ | |||
24 | 0 42 0x04 | 24 | 0 42 0x04 |
25 | 0 121 0x04 | 25 | 0 121 0x04 |
26 | 0 122 0x04>; | 26 | 0 122 0x04>; |
27 | clocks = <&tegra_car 5>; | ||
27 | }; | 28 | }; |
28 | 29 | ||
29 | tegra_car: clock { | 30 | tegra_car: clock { |
30 | compatible = "nvidia,tegra114-car, nvidia,tegra30-car"; | 31 | compatible = "nvidia,tegra114-car"; |
31 | reg = <0x60006000 0x1000>; | 32 | reg = <0x60006000 0x1000>; |
32 | #clock-cells = <1>; | 33 | #clock-cells = <1>; |
33 | }; | 34 | }; |
@@ -66,6 +67,7 @@ | |||
66 | reg-shift = <2>; | 67 | reg-shift = <2>; |
67 | interrupts = <0 36 0x04>; | 68 | interrupts = <0 36 0x04>; |
68 | status = "disabled"; | 69 | status = "disabled"; |
70 | clocks = <&tegra_car 6>; | ||
69 | }; | 71 | }; |
70 | 72 | ||
71 | serial@70006040 { | 73 | serial@70006040 { |
@@ -74,6 +76,7 @@ | |||
74 | reg-shift = <2>; | 76 | reg-shift = <2>; |
75 | interrupts = <0 37 0x04>; | 77 | interrupts = <0 37 0x04>; |
76 | status = "disabled"; | 78 | status = "disabled"; |
79 | clocks = <&tegra_car 192>; | ||
77 | }; | 80 | }; |
78 | 81 | ||
79 | serial@70006200 { | 82 | serial@70006200 { |
@@ -82,6 +85,7 @@ | |||
82 | reg-shift = <2>; | 85 | reg-shift = <2>; |
83 | interrupts = <0 46 0x04>; | 86 | interrupts = <0 46 0x04>; |
84 | status = "disabled"; | 87 | status = "disabled"; |
88 | clocks = <&tegra_car 55>; | ||
85 | }; | 89 | }; |
86 | 90 | ||
87 | serial@70006300 { | 91 | serial@70006300 { |
@@ -90,12 +94,14 @@ | |||
90 | reg-shift = <2>; | 94 | reg-shift = <2>; |
91 | interrupts = <0 90 0x04>; | 95 | interrupts = <0 90 0x04>; |
92 | status = "disabled"; | 96 | status = "disabled"; |
97 | clocks = <&tegra_car 65>; | ||
93 | }; | 98 | }; |
94 | 99 | ||
95 | rtc { | 100 | rtc { |
96 | compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc"; | 101 | compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc"; |
97 | reg = <0x7000e000 0x100>; | 102 | reg = <0x7000e000 0x100>; |
98 | interrupts = <0 2 0x04>; | 103 | interrupts = <0 2 0x04>; |
104 | clocks = <&tegra_car 4>; | ||
99 | }; | 105 | }; |
100 | 106 | ||
101 | pmc { | 107 | pmc { |
diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi index 68c8dc644383..4a4b96f6827e 100644 --- a/arch/arm/boot/dts/vt8500.dtsi +++ b/arch/arm/boot/dts/vt8500.dtsi | |||
@@ -25,11 +25,13 @@ | |||
25 | #interrupt-cells = <1>; | 25 | #interrupt-cells = <1>; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | gpio: gpio-controller@d8110000 { | 28 | pinctrl: pinctrl@d8110000 { |
29 | compatible = "via,vt8500-gpio"; | 29 | compatible = "via,vt8500-pinctrl"; |
30 | gpio-controller; | ||
31 | reg = <0xd8110000 0x10000>; | 30 | reg = <0xd8110000 0x10000>; |
32 | #gpio-cells = <3>; | 31 | interrupt-controller; |
32 | #interrupt-cells = <2>; | ||
33 | gpio-controller; | ||
34 | #gpio-cells = <2>; | ||
33 | }; | 35 | }; |
34 | 36 | ||
35 | pmc@d8130000 { | 37 | pmc@d8130000 { |
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi index 398b8bca791e..b2bf359e852f 100644 --- a/arch/arm/boot/dts/wm8505.dtsi +++ b/arch/arm/boot/dts/wm8505.dtsi | |||
@@ -40,11 +40,13 @@ | |||
40 | interrupts = <56 57 58 59 60 61 62 63>; | 40 | interrupts = <56 57 58 59 60 61 62 63>; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | gpio: gpio-controller@d8110000 { | 43 | pinctrl: pinctrl@d8110000 { |
44 | compatible = "wm,wm8505-gpio"; | 44 | compatible = "wm,wm8505-pinctrl"; |
45 | gpio-controller; | ||
46 | reg = <0xd8110000 0x10000>; | 45 | reg = <0xd8110000 0x10000>; |
47 | #gpio-cells = <3>; | 46 | interrupt-controller; |
47 | #interrupt-cells = <2>; | ||
48 | gpio-controller; | ||
49 | #gpio-cells = <2>; | ||
48 | }; | 50 | }; |
49 | 51 | ||
50 | pmc@d8130000 { | 52 | pmc@d8130000 { |
diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi index 9313407bbc30..dd8464eeb40d 100644 --- a/arch/arm/boot/dts/wm8650.dtsi +++ b/arch/arm/boot/dts/wm8650.dtsi | |||
@@ -34,11 +34,13 @@ | |||
34 | interrupts = <56 57 58 59 60 61 62 63>; | 34 | interrupts = <56 57 58 59 60 61 62 63>; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | gpio: gpio-controller@d8110000 { | 37 | pinctrl: pinctrl@d8110000 { |
38 | compatible = "wm,wm8650-gpio"; | 38 | compatible = "wm,wm8650-pinctrl"; |
39 | gpio-controller; | ||
40 | reg = <0xd8110000 0x10000>; | 39 | reg = <0xd8110000 0x10000>; |
41 | #gpio-cells = <3>; | 40 | interrupt-controller; |
41 | #interrupt-cells = <2>; | ||
42 | gpio-controller; | ||
43 | #gpio-cells = <2>; | ||
42 | }; | 44 | }; |
43 | 45 | ||
44 | pmc@d8130000 { | 46 | pmc@d8130000 { |
diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi index 7149cd13e3b9..fc790d0aee66 100644 --- a/arch/arm/boot/dts/wm8850.dtsi +++ b/arch/arm/boot/dts/wm8850.dtsi | |||
@@ -41,11 +41,13 @@ | |||
41 | interrupts = <56 57 58 59 60 61 62 63>; | 41 | interrupts = <56 57 58 59 60 61 62 63>; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | gpio: gpio-controller@d8110000 { | 44 | pinctrl: pinctrl@d8110000 { |
45 | compatible = "wm,wm8650-gpio"; | 45 | compatible = "wm,wm8850-pinctrl"; |
46 | gpio-controller; | ||
47 | reg = <0xd8110000 0x10000>; | 46 | reg = <0xd8110000 0x10000>; |
48 | #gpio-cells = <3>; | 47 | interrupt-controller; |
48 | #interrupt-cells = <2>; | ||
49 | gpio-controller; | ||
50 | #gpio-cells = <2>; | ||
49 | }; | 51 | }; |
50 | 52 | ||
51 | pmc@d8130000 { | 53 | pmc@d8130000 { |
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 9e1c339c4491..748fc347ed18 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi | |||
@@ -118,56 +118,23 @@ | |||
118 | }; | 118 | }; |
119 | 119 | ||
120 | ttc0: ttc0@f8001000 { | 120 | ttc0: ttc0@f8001000 { |
121 | #address-cells = <1>; | 121 | interrupt-parent = <&intc>; |
122 | #size-cells = <0>; | 122 | interrupts = < 0 10 4 0 11 4 0 12 4 >; |
123 | compatible = "xlnx,ttc"; | 123 | compatible = "cdns,ttc"; |
124 | reg = <0xF8001000 0x1000>; | 124 | reg = <0xF8001000 0x1000>; |
125 | clocks = <&cpu_clk 3>; | 125 | clocks = <&cpu_clk 3>; |
126 | clock-names = "cpu_1x"; | 126 | clock-names = "cpu_1x"; |
127 | clock-ranges; | 127 | clock-ranges; |
128 | |||
129 | ttc0_0: ttc0.0 { | ||
130 | status = "disabled"; | ||
131 | reg = <0>; | ||
132 | interrupts = <0 10 4>; | ||
133 | }; | ||
134 | ttc0_1: ttc0.1 { | ||
135 | status = "disabled"; | ||
136 | reg = <1>; | ||
137 | interrupts = <0 11 4>; | ||
138 | }; | ||
139 | ttc0_2: ttc0.2 { | ||
140 | status = "disabled"; | ||
141 | reg = <2>; | ||
142 | interrupts = <0 12 4>; | ||
143 | }; | ||
144 | }; | 128 | }; |
145 | 129 | ||
146 | ttc1: ttc1@f8002000 { | 130 | ttc1: ttc1@f8002000 { |
147 | #interrupt-parent = <&intc>; | 131 | interrupt-parent = <&intc>; |
148 | #address-cells = <1>; | 132 | interrupts = < 0 37 4 0 38 4 0 39 4 >; |
149 | #size-cells = <0>; | 133 | compatible = "cdns,ttc"; |
150 | compatible = "xlnx,ttc"; | ||
151 | reg = <0xF8002000 0x1000>; | 134 | reg = <0xF8002000 0x1000>; |
152 | clocks = <&cpu_clk 3>; | 135 | clocks = <&cpu_clk 3>; |
153 | clock-names = "cpu_1x"; | 136 | clock-names = "cpu_1x"; |
154 | clock-ranges; | 137 | clock-ranges; |
155 | |||
156 | ttc1_0: ttc1.0 { | ||
157 | status = "disabled"; | ||
158 | reg = <0>; | ||
159 | interrupts = <0 37 4>; | ||
160 | }; | ||
161 | ttc1_1: ttc1.1 { | ||
162 | status = "disabled"; | ||
163 | reg = <1>; | ||
164 | interrupts = <0 38 4>; | ||
165 | }; | ||
166 | ttc1_2: ttc1.2 { | ||
167 | status = "disabled"; | ||
168 | reg = <2>; | ||
169 | interrupts = <0 39 4>; | ||
170 | }; | ||
171 | }; | 138 | }; |
172 | }; | 139 | }; |
173 | }; | 140 | }; |
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index c772942a399a..86f44d5b0265 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts | |||
@@ -32,13 +32,3 @@ | |||
32 | &ps_clk { | 32 | &ps_clk { |
33 | clock-frequency = <33333330>; | 33 | clock-frequency = <33333330>; |
34 | }; | 34 | }; |
35 | |||
36 | &ttc0_0 { | ||
37 | status = "ok"; | ||
38 | compatible = "xlnx,ttc-counter-clocksource"; | ||
39 | }; | ||
40 | |||
41 | &ttc0_1 { | ||
42 | status = "ok"; | ||
43 | compatible = "xlnx,ttc-counter-clockevent"; | ||
44 | }; | ||