summaryrefslogtreecommitdiffstats
path: root/arch/arc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-10 13:11:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-10 13:11:26 -0400
commit8f041e6ca1901d7dbf017e6db67c264117211b8a (patch)
treeeeae46a7ba63e656a802ece06501a623bec7f914 /arch/arc
parentb247759642cc96a75122907cc898b4c43b4f86ce (diff)
parent723e2b801d803035ec7a7c0fe162a6c9fc118164 (diff)
Merge tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull second set of ARC architecture updates from Vineet Gupta: "Couple of Platform updates (Device Tree files primarily) given that the corresponding drivers (net/ethernet/arc/*, irqctl/irq-tb10x.c) have now been merged into your tree. Ideally these shd have been part of same submissions, oh well..." * tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: [TB10x] Updates for irqchip driver ARC: [plat-arcfpga] Enable arc_emac for ARCAngle4 Board
Diffstat (limited to 'arch/arc')
-rw-r--r--arch/arc/boot/dts/abilis_tb100.dtsi32
-rw-r--r--arch/arc/boot/dts/abilis_tb101.dtsi32
-rw-r--r--arch/arc/boot/dts/abilis_tb10x.dtsi32
-rw-r--r--arch/arc/boot/dts/angel4.dts16
-rw-r--r--arch/arc/configs/fpga_defconfig3
-rw-r--r--arch/arc/plat-arcfpga/include/plat/irq.h2
-rw-r--r--arch/arc/plat-arcfpga/include/plat/memmap.h2
-rw-r--r--arch/arc/plat-tb10x/Kconfig1
8 files changed, 62 insertions, 58 deletions
diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi
index 941ad118a7e7..d9f8249aa66e 100644
--- a/arch/arc/boot/dts/abilis_tb100.dtsi
+++ b/arch/arc/boot/dts/abilis_tb100.dtsi
@@ -21,10 +21,6 @@
21 21
22/include/ "abilis_tb10x.dtsi" 22/include/ "abilis_tb10x.dtsi"
23 23
24/* interrupt specifiers
25 * --------------------
26 * 0: rising, 1: low, 2: high, 3: falling,
27 */
28 24
29/ { 25/ {
30 clock-frequency = <500000000>; /* 500 MHZ */ 26 clock-frequency = <500000000>; /* 500 MHZ */
@@ -173,7 +169,7 @@
173 interrupt-controller; 169 interrupt-controller;
174 #interrupt-cells = <1>; 170 #interrupt-cells = <1>;
175 interrupt-parent = <&tb10x_ictl>; 171 interrupt-parent = <&tb10x_ictl>;
176 interrupts = <27 1>; 172 interrupts = <27 2>;
177 reg = <0xFF140000 0x1000>; 173 reg = <0xFF140000 0x1000>;
178 gpio-controller; 174 gpio-controller;
179 #gpio-cells = <1>; 175 #gpio-cells = <1>;
@@ -185,7 +181,7 @@
185 interrupt-controller; 181 interrupt-controller;
186 #interrupt-cells = <1>; 182 #interrupt-cells = <1>;
187 interrupt-parent = <&tb10x_ictl>; 183 interrupt-parent = <&tb10x_ictl>;
188 interrupts = <27 1>; 184 interrupts = <27 2>;
189 reg = <0xFF141000 0x1000>; 185 reg = <0xFF141000 0x1000>;
190 gpio-controller; 186 gpio-controller;
191 #gpio-cells = <1>; 187 #gpio-cells = <1>;
@@ -197,7 +193,7 @@
197 interrupt-controller; 193 interrupt-controller;
198 #interrupt-cells = <1>; 194 #interrupt-cells = <1>;
199 interrupt-parent = <&tb10x_ictl>; 195 interrupt-parent = <&tb10x_ictl>;
200 interrupts = <27 1>; 196 interrupts = <27 2>;
201 reg = <0xFF142000 0x1000>; 197 reg = <0xFF142000 0x1000>;
202 gpio-controller; 198 gpio-controller;
203 #gpio-cells = <1>; 199 #gpio-cells = <1>;
@@ -209,7 +205,7 @@
209 interrupt-controller; 205 interrupt-controller;
210 #interrupt-cells = <1>; 206 #interrupt-cells = <1>;
211 interrupt-parent = <&tb10x_ictl>; 207 interrupt-parent = <&tb10x_ictl>;
212 interrupts = <27 1>; 208 interrupts = <27 2>;
213 reg = <0xFF143000 0x1000>; 209 reg = <0xFF143000 0x1000>;
214 gpio-controller; 210 gpio-controller;
215 #gpio-cells = <1>; 211 #gpio-cells = <1>;
@@ -221,7 +217,7 @@
221 interrupt-controller; 217 interrupt-controller;
222 #interrupt-cells = <1>; 218 #interrupt-cells = <1>;
223 interrupt-parent = <&tb10x_ictl>; 219 interrupt-parent = <&tb10x_ictl>;
224 interrupts = <27 1>; 220 interrupts = <27 2>;
225 reg = <0xFF144000 0x1000>; 221 reg = <0xFF144000 0x1000>;
226 gpio-controller; 222 gpio-controller;
227 #gpio-cells = <1>; 223 #gpio-cells = <1>;
@@ -233,7 +229,7 @@
233 interrupt-controller; 229 interrupt-controller;
234 #interrupt-cells = <1>; 230 #interrupt-cells = <1>;
235 interrupt-parent = <&tb10x_ictl>; 231 interrupt-parent = <&tb10x_ictl>;
236 interrupts = <27 1>; 232 interrupts = <27 2>;
237 reg = <0xFF145000 0x1000>; 233 reg = <0xFF145000 0x1000>;
238 gpio-controller; 234 gpio-controller;
239 #gpio-cells = <1>; 235 #gpio-cells = <1>;
@@ -245,7 +241,7 @@
245 interrupt-controller; 241 interrupt-controller;
246 #interrupt-cells = <1>; 242 #interrupt-cells = <1>;
247 interrupt-parent = <&tb10x_ictl>; 243 interrupt-parent = <&tb10x_ictl>;
248 interrupts = <27 1>; 244 interrupts = <27 2>;
249 reg = <0xFF146000 0x1000>; 245 reg = <0xFF146000 0x1000>;
250 gpio-controller; 246 gpio-controller;
251 #gpio-cells = <1>; 247 #gpio-cells = <1>;
@@ -257,7 +253,7 @@
257 interrupt-controller; 253 interrupt-controller;
258 #interrupt-cells = <1>; 254 #interrupt-cells = <1>;
259 interrupt-parent = <&tb10x_ictl>; 255 interrupt-parent = <&tb10x_ictl>;
260 interrupts = <27 1>; 256 interrupts = <27 2>;
261 reg = <0xFF147000 0x1000>; 257 reg = <0xFF147000 0x1000>;
262 gpio-controller; 258 gpio-controller;
263 #gpio-cells = <1>; 259 #gpio-cells = <1>;
@@ -269,7 +265,7 @@
269 interrupt-controller; 265 interrupt-controller;
270 #interrupt-cells = <1>; 266 #interrupt-cells = <1>;
271 interrupt-parent = <&tb10x_ictl>; 267 interrupt-parent = <&tb10x_ictl>;
272 interrupts = <27 1>; 268 interrupts = <27 2>;
273 reg = <0xFF148000 0x1000>; 269 reg = <0xFF148000 0x1000>;
274 gpio-controller; 270 gpio-controller;
275 #gpio-cells = <1>; 271 #gpio-cells = <1>;
@@ -281,7 +277,7 @@
281 interrupt-controller; 277 interrupt-controller;
282 #interrupt-cells = <1>; 278 #interrupt-cells = <1>;
283 interrupt-parent = <&tb10x_ictl>; 279 interrupt-parent = <&tb10x_ictl>;
284 interrupts = <27 1>; 280 interrupts = <27 2>;
285 reg = <0xFF149000 0x1000>; 281 reg = <0xFF149000 0x1000>;
286 gpio-controller; 282 gpio-controller;
287 #gpio-cells = <1>; 283 #gpio-cells = <1>;
@@ -293,7 +289,7 @@
293 interrupt-controller; 289 interrupt-controller;
294 #interrupt-cells = <1>; 290 #interrupt-cells = <1>;
295 interrupt-parent = <&tb10x_ictl>; 291 interrupt-parent = <&tb10x_ictl>;
296 interrupts = <27 1>; 292 interrupts = <27 2>;
297 reg = <0xFF14A000 0x1000>; 293 reg = <0xFF14A000 0x1000>;
298 gpio-controller; 294 gpio-controller;
299 #gpio-cells = <1>; 295 #gpio-cells = <1>;
@@ -305,7 +301,7 @@
305 interrupt-controller; 301 interrupt-controller;
306 #interrupt-cells = <1>; 302 #interrupt-cells = <1>;
307 interrupt-parent = <&tb10x_ictl>; 303 interrupt-parent = <&tb10x_ictl>;
308 interrupts = <27 1>; 304 interrupts = <27 2>;
309 reg = <0xFF14B000 0x1000>; 305 reg = <0xFF14B000 0x1000>;
310 gpio-controller; 306 gpio-controller;
311 #gpio-cells = <1>; 307 #gpio-cells = <1>;
@@ -317,7 +313,7 @@
317 interrupt-controller; 313 interrupt-controller;
318 #interrupt-cells = <1>; 314 #interrupt-cells = <1>;
319 interrupt-parent = <&tb10x_ictl>; 315 interrupt-parent = <&tb10x_ictl>;
320 interrupts = <27 1>; 316 interrupts = <27 2>;
321 reg = <0xFF14C000 0x1000>; 317 reg = <0xFF14C000 0x1000>;
322 gpio-controller; 318 gpio-controller;
323 #gpio-cells = <1>; 319 #gpio-cells = <1>;
@@ -329,7 +325,7 @@
329 interrupt-controller; 325 interrupt-controller;
330 #interrupt-cells = <1>; 326 #interrupt-cells = <1>;
331 interrupt-parent = <&tb10x_ictl>; 327 interrupt-parent = <&tb10x_ictl>;
332 interrupts = <27 1>; 328 interrupts = <27 2>;
333 reg = <0xFF14D000 0x1000>; 329 reg = <0xFF14D000 0x1000>;
334 gpio-controller; 330 gpio-controller;
335 #gpio-cells = <1>; 331 #gpio-cells = <1>;
diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi
index fd25c212049f..da8ca7941e67 100644
--- a/arch/arc/boot/dts/abilis_tb101.dtsi
+++ b/arch/arc/boot/dts/abilis_tb101.dtsi
@@ -21,10 +21,6 @@
21 21
22/include/ "abilis_tb10x.dtsi" 22/include/ "abilis_tb10x.dtsi"
23 23
24/* interrupt specifiers
25 * --------------------
26 * 0: rising, 1: low, 2: high, 3: falling,
27 */
28 24
29/ { 25/ {
30 clock-frequency = <500000000>; /* 500 MHZ */ 26 clock-frequency = <500000000>; /* 500 MHZ */
@@ -182,7 +178,7 @@
182 interrupt-controller; 178 interrupt-controller;
183 #interrupt-cells = <1>; 179 #interrupt-cells = <1>;
184 interrupt-parent = <&tb10x_ictl>; 180 interrupt-parent = <&tb10x_ictl>;
185 interrupts = <27 1>; 181 interrupts = <27 2>;
186 reg = <0xFF140000 0x1000>; 182 reg = <0xFF140000 0x1000>;
187 gpio-controller; 183 gpio-controller;
188 #gpio-cells = <1>; 184 #gpio-cells = <1>;
@@ -194,7 +190,7 @@
194 interrupt-controller; 190 interrupt-controller;
195 #interrupt-cells = <1>; 191 #interrupt-cells = <1>;
196 interrupt-parent = <&tb10x_ictl>; 192 interrupt-parent = <&tb10x_ictl>;
197 interrupts = <27 1>; 193 interrupts = <27 2>;
198 reg = <0xFF141000 0x1000>; 194 reg = <0xFF141000 0x1000>;
199 gpio-controller; 195 gpio-controller;
200 #gpio-cells = <1>; 196 #gpio-cells = <1>;
@@ -206,7 +202,7 @@
206 interrupt-controller; 202 interrupt-controller;
207 #interrupt-cells = <1>; 203 #interrupt-cells = <1>;
208 interrupt-parent = <&tb10x_ictl>; 204 interrupt-parent = <&tb10x_ictl>;
209 interrupts = <27 1>; 205 interrupts = <27 2>;
210 reg = <0xFF142000 0x1000>; 206 reg = <0xFF142000 0x1000>;
211 gpio-controller; 207 gpio-controller;
212 #gpio-cells = <1>; 208 #gpio-cells = <1>;
@@ -218,7 +214,7 @@
218 interrupt-controller; 214 interrupt-controller;
219 #interrupt-cells = <1>; 215 #interrupt-cells = <1>;
220 interrupt-parent = <&tb10x_ictl>; 216 interrupt-parent = <&tb10x_ictl>;
221 interrupts = <27 1>; 217 interrupts = <27 2>;
222 reg = <0xFF143000 0x1000>; 218 reg = <0xFF143000 0x1000>;
223 gpio-controller; 219 gpio-controller;
224 #gpio-cells = <1>; 220 #gpio-cells = <1>;
@@ -230,7 +226,7 @@
230 interrupt-controller; 226 interrupt-controller;
231 #interrupt-cells = <1>; 227 #interrupt-cells = <1>;
232 interrupt-parent = <&tb10x_ictl>; 228 interrupt-parent = <&tb10x_ictl>;
233 interrupts = <27 1>; 229 interrupts = <27 2>;
234 reg = <0xFF144000 0x1000>; 230 reg = <0xFF144000 0x1000>;
235 gpio-controller; 231 gpio-controller;
236 #gpio-cells = <1>; 232 #gpio-cells = <1>;
@@ -242,7 +238,7 @@
242 interrupt-controller; 238 interrupt-controller;
243 #interrupt-cells = <1>; 239 #interrupt-cells = <1>;
244 interrupt-parent = <&tb10x_ictl>; 240 interrupt-parent = <&tb10x_ictl>;
245 interrupts = <27 1>; 241 interrupts = <27 2>;
246 reg = <0xFF145000 0x1000>; 242 reg = <0xFF145000 0x1000>;
247 gpio-controller; 243 gpio-controller;
248 #gpio-cells = <1>; 244 #gpio-cells = <1>;
@@ -254,7 +250,7 @@
254 interrupt-controller; 250 interrupt-controller;
255 #interrupt-cells = <1>; 251 #interrupt-cells = <1>;
256 interrupt-parent = <&tb10x_ictl>; 252 interrupt-parent = <&tb10x_ictl>;
257 interrupts = <27 1>; 253 interrupts = <27 2>;
258 reg = <0xFF146000 0x1000>; 254 reg = <0xFF146000 0x1000>;
259 gpio-controller; 255 gpio-controller;
260 #gpio-cells = <1>; 256 #gpio-cells = <1>;
@@ -266,7 +262,7 @@
266 interrupt-controller; 262 interrupt-controller;
267 #interrupt-cells = <1>; 263 #interrupt-cells = <1>;
268 interrupt-parent = <&tb10x_ictl>; 264 interrupt-parent = <&tb10x_ictl>;
269 interrupts = <27 1>; 265 interrupts = <27 2>;
270 reg = <0xFF147000 0x1000>; 266 reg = <0xFF147000 0x1000>;
271 gpio-controller; 267 gpio-controller;
272 #gpio-cells = <1>; 268 #gpio-cells = <1>;
@@ -278,7 +274,7 @@
278 interrupt-controller; 274 interrupt-controller;
279 #interrupt-cells = <1>; 275 #interrupt-cells = <1>;
280 interrupt-parent = <&tb10x_ictl>; 276 interrupt-parent = <&tb10x_ictl>;
281 interrupts = <27 1>; 277 interrupts = <27 2>;
282 reg = <0xFF148000 0x1000>; 278 reg = <0xFF148000 0x1000>;
283 gpio-controller; 279 gpio-controller;
284 #gpio-cells = <1>; 280 #gpio-cells = <1>;
@@ -290,7 +286,7 @@
290 interrupt-controller; 286 interrupt-controller;
291 #interrupt-cells = <1>; 287 #interrupt-cells = <1>;
292 interrupt-parent = <&tb10x_ictl>; 288 interrupt-parent = <&tb10x_ictl>;
293 interrupts = <27 1>; 289 interrupts = <27 2>;
294 reg = <0xFF149000 0x1000>; 290 reg = <0xFF149000 0x1000>;
295 gpio-controller; 291 gpio-controller;
296 #gpio-cells = <1>; 292 #gpio-cells = <1>;
@@ -302,7 +298,7 @@
302 interrupt-controller; 298 interrupt-controller;
303 #interrupt-cells = <1>; 299 #interrupt-cells = <1>;
304 interrupt-parent = <&tb10x_ictl>; 300 interrupt-parent = <&tb10x_ictl>;
305 interrupts = <27 1>; 301 interrupts = <27 2>;
306 reg = <0xFF14A000 0x1000>; 302 reg = <0xFF14A000 0x1000>;
307 gpio-controller; 303 gpio-controller;
308 #gpio-cells = <1>; 304 #gpio-cells = <1>;
@@ -314,7 +310,7 @@
314 interrupt-controller; 310 interrupt-controller;
315 #interrupt-cells = <1>; 311 #interrupt-cells = <1>;
316 interrupt-parent = <&tb10x_ictl>; 312 interrupt-parent = <&tb10x_ictl>;
317 interrupts = <27 1>; 313 interrupts = <27 2>;
318 reg = <0xFF14B000 0x1000>; 314 reg = <0xFF14B000 0x1000>;
319 gpio-controller; 315 gpio-controller;
320 #gpio-cells = <1>; 316 #gpio-cells = <1>;
@@ -326,7 +322,7 @@
326 interrupt-controller; 322 interrupt-controller;
327 #interrupt-cells = <1>; 323 #interrupt-cells = <1>;
328 interrupt-parent = <&tb10x_ictl>; 324 interrupt-parent = <&tb10x_ictl>;
329 interrupts = <27 1>; 325 interrupts = <27 2>;
330 reg = <0xFF14C000 0x1000>; 326 reg = <0xFF14C000 0x1000>;
331 gpio-controller; 327 gpio-controller;
332 #gpio-cells = <1>; 328 #gpio-cells = <1>;
@@ -338,7 +334,7 @@
338 interrupt-controller; 334 interrupt-controller;
339 #interrupt-cells = <1>; 335 #interrupt-cells = <1>;
340 interrupt-parent = <&tb10x_ictl>; 336 interrupt-parent = <&tb10x_ictl>;
341 interrupts = <27 1>; 337 interrupts = <27 2>;
342 reg = <0xFF14D000 0x1000>; 338 reg = <0xFF14D000 0x1000>;
343 gpio-controller; 339 gpio-controller;
344 #gpio-cells = <1>; 340 #gpio-cells = <1>;
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi
index b97e3051ba4b..edf56f4749e1 100644
--- a/arch/arc/boot/dts/abilis_tb10x.dtsi
+++ b/arch/arc/boot/dts/abilis_tb10x.dtsi
@@ -19,10 +19,6 @@
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21 21
22/* interrupt specifiers
23 * --------------------
24 * 0: rising, 1: low, 2: high, 3: falling,
25 */
26 22
27/ { 23/ {
28 compatible = "abilis,arc-tb10x"; 24 compatible = "abilis,arc-tb10x";
@@ -78,7 +74,7 @@
78 #interrupt-cells = <1>; 74 #interrupt-cells = <1>;
79 }; 75 };
80 tb10x_ictl: pic@fe002000 { 76 tb10x_ictl: pic@fe002000 {
81 compatible = "abilis,tb10x_ictl"; 77 compatible = "abilis,tb10x-ictl";
82 reg = <0xFE002000 0x20>; 78 reg = <0xFE002000 0x20>;
83 interrupt-controller; 79 interrupt-controller;
84 #interrupt-cells = <2>; 80 #interrupt-cells = <2>;
@@ -91,7 +87,7 @@
91 compatible = "snps,dw-apb-uart"; 87 compatible = "snps,dw-apb-uart";
92 reg = <0xFF100000 0x100>; 88 reg = <0xFF100000 0x100>;
93 clock-frequency = <166666666>; 89 clock-frequency = <166666666>;
94 interrupts = <25 1>; 90 interrupts = <25 8>;
95 reg-shift = <2>; 91 reg-shift = <2>;
96 reg-io-width = <4>; 92 reg-io-width = <4>;
97 interrupt-parent = <&tb10x_ictl>; 93 interrupt-parent = <&tb10x_ictl>;
@@ -100,7 +96,7 @@
100 compatible = "snps,dwmac-3.70a","snps,dwmac"; 96 compatible = "snps,dwmac-3.70a","snps,dwmac";
101 reg = <0xFE100000 0x1058>; 97 reg = <0xFE100000 0x1058>;
102 interrupt-parent = <&tb10x_ictl>; 98 interrupt-parent = <&tb10x_ictl>;
103 interrupts = <6 1>; 99 interrupts = <6 8>;
104 interrupt-names = "macirq"; 100 interrupt-names = "macirq";
105 clocks = <&ahb_clk>; 101 clocks = <&ahb_clk>;
106 clock-names = "stmmaceth"; 102 clock-names = "stmmaceth";
@@ -109,7 +105,7 @@
109 compatible = "snps,dma-spear1340"; 105 compatible = "snps,dma-spear1340";
110 reg = <0xFE000000 0x400>; 106 reg = <0xFE000000 0x400>;
111 interrupt-parent = <&tb10x_ictl>; 107 interrupt-parent = <&tb10x_ictl>;
112 interrupts = <14 1>; 108 interrupts = <14 8>;
113 dma-channels = <6>; 109 dma-channels = <6>;
114 dma-requests = <0>; 110 dma-requests = <0>;
115 dma-masters = <1>; 111 dma-masters = <1>;
@@ -128,7 +124,7 @@
128 compatible = "snps,designware-i2c"; 124 compatible = "snps,designware-i2c";
129 reg = <0xFF120000 0x1000>; 125 reg = <0xFF120000 0x1000>;
130 interrupt-parent = <&tb10x_ictl>; 126 interrupt-parent = <&tb10x_ictl>;
131 interrupts = <12 1>; 127 interrupts = <12 8>;
132 clocks = <&ahb_clk>; 128 clocks = <&ahb_clk>;
133 }; 129 };
134 i2c1: i2c@FF121000 { 130 i2c1: i2c@FF121000 {
@@ -137,7 +133,7 @@
137 compatible = "snps,designware-i2c"; 133 compatible = "snps,designware-i2c";
138 reg = <0xFF121000 0x1000>; 134 reg = <0xFF121000 0x1000>;
139 interrupt-parent = <&tb10x_ictl>; 135 interrupt-parent = <&tb10x_ictl>;
140 interrupts = <12 1>; 136 interrupts = <12 8>;
141 clocks = <&ahb_clk>; 137 clocks = <&ahb_clk>;
142 }; 138 };
143 i2c2: i2c@FF122000 { 139 i2c2: i2c@FF122000 {
@@ -146,7 +142,7 @@
146 compatible = "snps,designware-i2c"; 142 compatible = "snps,designware-i2c";
147 reg = <0xFF122000 0x1000>; 143 reg = <0xFF122000 0x1000>;
148 interrupt-parent = <&tb10x_ictl>; 144 interrupt-parent = <&tb10x_ictl>;
149 interrupts = <12 1>; 145 interrupts = <12 8>;
150 clocks = <&ahb_clk>; 146 clocks = <&ahb_clk>;
151 }; 147 };
152 i2c3: i2c@FF123000 { 148 i2c3: i2c@FF123000 {
@@ -155,7 +151,7 @@
155 compatible = "snps,designware-i2c"; 151 compatible = "snps,designware-i2c";
156 reg = <0xFF123000 0x1000>; 152 reg = <0xFF123000 0x1000>;
157 interrupt-parent = <&tb10x_ictl>; 153 interrupt-parent = <&tb10x_ictl>;
158 interrupts = <12 1>; 154 interrupts = <12 8>;
159 clocks = <&ahb_clk>; 155 clocks = <&ahb_clk>;
160 }; 156 };
161 i2c4: i2c@FF124000 { 157 i2c4: i2c@FF124000 {
@@ -164,7 +160,7 @@
164 compatible = "snps,designware-i2c"; 160 compatible = "snps,designware-i2c";
165 reg = <0xFF124000 0x1000>; 161 reg = <0xFF124000 0x1000>;
166 interrupt-parent = <&tb10x_ictl>; 162 interrupt-parent = <&tb10x_ictl>;
167 interrupts = <12 1>; 163 interrupts = <12 8>;
168 clocks = <&ahb_clk>; 164 clocks = <&ahb_clk>;
169 }; 165 };
170 166
@@ -176,7 +172,7 @@
176 num-cs = <1>; 172 num-cs = <1>;
177 reg = <0xFE010000 0x20>; 173 reg = <0xFE010000 0x20>;
178 interrupt-parent = <&tb10x_ictl>; 174 interrupt-parent = <&tb10x_ictl>;
179 interrupts = <26 1>; 175 interrupts = <26 8>;
180 clocks = <&ahb_clk>; 176 clocks = <&ahb_clk>;
181 }; 177 };
182 spi1: spi@0xFE011000 { 178 spi1: spi@0xFE011000 {
@@ -187,7 +183,7 @@
187 num-cs = <2>; 183 num-cs = <2>;
188 reg = <0xFE011000 0x20>; 184 reg = <0xFE011000 0x20>;
189 interrupt-parent = <&tb10x_ictl>; 185 interrupt-parent = <&tb10x_ictl>;
190 interrupts = <10 1>; 186 interrupts = <10 8>;
191 clocks = <&ahb_clk>; 187 clocks = <&ahb_clk>;
192 }; 188 };
193 189
@@ -195,7 +191,7 @@
195 compatible = "abilis,tb100-tsm"; 191 compatible = "abilis,tb100-tsm";
196 reg = <0xff316000 0x400>; 192 reg = <0xff316000 0x400>;
197 interrupt-parent = <&tb10x_ictl>; 193 interrupt-parent = <&tb10x_ictl>;
198 interrupts = <17 1>; 194 interrupts = <17 8>;
199 output-clkdiv = <4>; 195 output-clkdiv = <4>;
200 global-packet-delay = <0x21>; 196 global-packet-delay = <0x21>;
201 port-packet-delay = <0>; 197 port-packet-delay = <0>;
@@ -213,7 +209,7 @@
213 "cpuctrl", 209 "cpuctrl",
214 "a6it_int_force"; 210 "a6it_int_force";
215 interrupt-parent = <&tb10x_ictl>; 211 interrupt-parent = <&tb10x_ictl>;
216 interrupts = <20 1>, <19 1>; 212 interrupts = <20 2>, <19 2>;
217 interrupt-names = "cmd_irq", "event_irq"; 213 interrupt-names = "cmd_irq", "event_irq";
218 }; 214 };
219 tb10x_mdsc0: tb10x-mdscr@FF300000 { 215 tb10x_mdsc0: tb10x-mdscr@FF300000 {
@@ -239,7 +235,7 @@
239 compatible = "abilis,tb100-wfb"; 235 compatible = "abilis,tb100-wfb";
240 reg = <0xff319000 0x1000>; 236 reg = <0xff319000 0x1000>;
241 interrupt-parent = <&tb10x_ictl>; 237 interrupt-parent = <&tb10x_ictl>;
242 interrupts = <16 1>; 238 interrupts = <16 8>;
243 }; 239 };
244 }; 240 };
245}; 241};
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index bae4f936cb03..4fb2d6f655bd 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -51,5 +51,21 @@
51 current-speed = <115200>; 51 current-speed = <115200>;
52 status = "okay"; 52 status = "okay";
53 }; 53 };
54
55 ethernet@c0fc2000 {
56 compatible = "snps,arc-emac";
57 reg = <0xc0fc2000 0x3c>;
58 interrupts = <6>;
59 mac-address = [ 00 11 22 33 44 55 ];
60 clock-frequency = <80000000>;
61 max-speed = <100>;
62 phy = <&phy0>;
63
64 #address-cells = <1>;
65 #size-cells = <0>;
66 phy0: ethernet-phy@0 {
67 reg = <1>;
68 };
69 };
54 }; 70 };
55}; 71};
diff --git a/arch/arc/configs/fpga_defconfig b/arch/arc/configs/fpga_defconfig
index c109af320274..4ca50f1f8d05 100644
--- a/arch/arc/configs/fpga_defconfig
+++ b/arch/arc/configs/fpga_defconfig
@@ -38,6 +38,9 @@ CONFIG_INET=y
38# CONFIG_PREVENT_FIRMWARE_BUILD is not set 38# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39# CONFIG_FIRMWARE_IN_KERNEL is not set 39# CONFIG_FIRMWARE_IN_KERNEL is not set
40# CONFIG_BLK_DEV is not set 40# CONFIG_BLK_DEV is not set
41CONFIG_NETDEVICES=y
42CONFIG_ARC_EMAC=y
43CONFIG_LXT_PHY=y
41# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 44# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
42# CONFIG_INPUT_KEYBOARD is not set 45# CONFIG_INPUT_KEYBOARD is not set
43# CONFIG_INPUT_MOUSE is not set 46# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/arc/plat-arcfpga/include/plat/irq.h b/arch/arc/plat-arcfpga/include/plat/irq.h
index 41e335670f60..6adbc53c3a5b 100644
--- a/arch/arc/plat-arcfpga/include/plat/irq.h
+++ b/arch/arc/plat-arcfpga/include/plat/irq.h
@@ -16,8 +16,6 @@
16#define UART1_IRQ 10 16#define UART1_IRQ 10
17#define UART2_IRQ 11 17#define UART2_IRQ 11
18 18
19#define VMAC_IRQ 6
20
21#define IDE_IRQ 13 19#define IDE_IRQ 13
22#define PCI_IRQ 14 20#define PCI_IRQ 14
23#define PS2_IRQ 15 21#define PS2_IRQ 15
diff --git a/arch/arc/plat-arcfpga/include/plat/memmap.h b/arch/arc/plat-arcfpga/include/plat/memmap.h
index 1663f3388085..5c78e6135a1f 100644
--- a/arch/arc/plat-arcfpga/include/plat/memmap.h
+++ b/arch/arc/plat-arcfpga/include/plat/memmap.h
@@ -15,8 +15,6 @@
15#define UART0_BASE 0xC0FC1000 15#define UART0_BASE 0xC0FC1000
16#define UART1_BASE 0xC0FC1100 16#define UART1_BASE 0xC0FC1100
17 17
18#define VMAC_REG_BASEADDR 0xC0FC2000
19
20#define IDE_CONTROLLER_BASE 0xC0FC9000 18#define IDE_CONTROLLER_BASE 0xC0FC9000
21 19
22#define AHB_PCI_HOST_BRG_BASE 0xC0FD0000 20#define AHB_PCI_HOST_BRG_BASE 0xC0FD0000
diff --git a/arch/arc/plat-tb10x/Kconfig b/arch/arc/plat-tb10x/Kconfig
index 1d3452100f1f..1ab386bb5da8 100644
--- a/arch/arc/plat-tb10x/Kconfig
+++ b/arch/arc/plat-tb10x/Kconfig
@@ -22,6 +22,7 @@ menuconfig ARC_PLAT_TB10X
22 select PINCTRL 22 select PINCTRL
23 select PINMUX 23 select PINMUX
24 select ARCH_REQUIRE_GPIOLIB 24 select ARCH_REQUIRE_GPIOLIB
25 select TB10X_IRQC
25 help 26 help
26 Support for platforms based on the TB10x home media gateway SOC by 27 Support for platforms based on the TB10x home media gateway SOC by
27 Abilis Systems. TB10x is based on the ARC700 CPU architecture. 28 Abilis Systems. TB10x is based on the ARC700 CPU architecture.
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-11 21:48:38 -0500