Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+62
-58
+14
-18
arch/arc/boot/dts/abilis_tb100.dtsi
+14
-18
arch/arc/boot/dts/abilis_tb100.dtsi
···
21
21
22
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
26
clock-frequency = <500000000>; /* 500 MHZ */
···
169
173
interrupt-controller;
170
174
#interrupt-cells = <1>;
171
175
interrupt-parent = <&tb10x_ictl>;
172
-
interrupts = <27 1>;
176
+
interrupts = <27 2>;
173
177
reg = <0xFF140000 0x1000>;
174
178
gpio-controller;
175
179
#gpio-cells = <1>;
···
181
185
interrupt-controller;
182
186
#interrupt-cells = <1>;
183
187
interrupt-parent = <&tb10x_ictl>;
184
-
interrupts = <27 1>;
188
+
interrupts = <27 2>;
185
189
reg = <0xFF141000 0x1000>;
186
190
gpio-controller;
187
191
#gpio-cells = <1>;
···
193
197
interrupt-controller;
194
198
#interrupt-cells = <1>;
195
199
interrupt-parent = <&tb10x_ictl>;
196
-
interrupts = <27 1>;
200
+
interrupts = <27 2>;
197
201
reg = <0xFF142000 0x1000>;
198
202
gpio-controller;
199
203
#gpio-cells = <1>;
···
205
209
interrupt-controller;
206
210
#interrupt-cells = <1>;
207
211
interrupt-parent = <&tb10x_ictl>;
208
-
interrupts = <27 1>;
212
+
interrupts = <27 2>;
209
213
reg = <0xFF143000 0x1000>;
210
214
gpio-controller;
211
215
#gpio-cells = <1>;
···
217
221
interrupt-controller;
218
222
#interrupt-cells = <1>;
219
223
interrupt-parent = <&tb10x_ictl>;
220
-
interrupts = <27 1>;
224
+
interrupts = <27 2>;
221
225
reg = <0xFF144000 0x1000>;
222
226
gpio-controller;
223
227
#gpio-cells = <1>;
···
229
233
interrupt-controller;
230
234
#interrupt-cells = <1>;
231
235
interrupt-parent = <&tb10x_ictl>;
232
-
interrupts = <27 1>;
236
+
interrupts = <27 2>;
233
237
reg = <0xFF145000 0x1000>;
234
238
gpio-controller;
235
239
#gpio-cells = <1>;
···
241
245
interrupt-controller;
242
246
#interrupt-cells = <1>;
243
247
interrupt-parent = <&tb10x_ictl>;
244
-
interrupts = <27 1>;
248
+
interrupts = <27 2>;
245
249
reg = <0xFF146000 0x1000>;
246
250
gpio-controller;
247
251
#gpio-cells = <1>;
···
253
257
interrupt-controller;
254
258
#interrupt-cells = <1>;
255
259
interrupt-parent = <&tb10x_ictl>;
256
-
interrupts = <27 1>;
260
+
interrupts = <27 2>;
257
261
reg = <0xFF147000 0x1000>;
258
262
gpio-controller;
259
263
#gpio-cells = <1>;
···
265
269
interrupt-controller;
266
270
#interrupt-cells = <1>;
267
271
interrupt-parent = <&tb10x_ictl>;
268
-
interrupts = <27 1>;
272
+
interrupts = <27 2>;
269
273
reg = <0xFF148000 0x1000>;
270
274
gpio-controller;
271
275
#gpio-cells = <1>;
···
277
281
interrupt-controller;
278
282
#interrupt-cells = <1>;
279
283
interrupt-parent = <&tb10x_ictl>;
280
-
interrupts = <27 1>;
284
+
interrupts = <27 2>;
281
285
reg = <0xFF149000 0x1000>;
282
286
gpio-controller;
283
287
#gpio-cells = <1>;
···
289
293
interrupt-controller;
290
294
#interrupt-cells = <1>;
291
295
interrupt-parent = <&tb10x_ictl>;
292
-
interrupts = <27 1>;
296
+
interrupts = <27 2>;
293
297
reg = <0xFF14A000 0x1000>;
294
298
gpio-controller;
295
299
#gpio-cells = <1>;
···
301
305
interrupt-controller;
302
306
#interrupt-cells = <1>;
303
307
interrupt-parent = <&tb10x_ictl>;
304
-
interrupts = <27 1>;
308
+
interrupts = <27 2>;
305
309
reg = <0xFF14B000 0x1000>;
306
310
gpio-controller;
307
311
#gpio-cells = <1>;
···
313
317
interrupt-controller;
314
318
#interrupt-cells = <1>;
315
319
interrupt-parent = <&tb10x_ictl>;
316
-
interrupts = <27 1>;
320
+
interrupts = <27 2>;
317
321
reg = <0xFF14C000 0x1000>;
318
322
gpio-controller;
319
323
#gpio-cells = <1>;
···
325
329
interrupt-controller;
326
330
#interrupt-cells = <1>;
327
331
interrupt-parent = <&tb10x_ictl>;
328
-
interrupts = <27 1>;
332
+
interrupts = <27 2>;
329
333
reg = <0xFF14D000 0x1000>;
330
334
gpio-controller;
331
335
#gpio-cells = <1>;
+14
-18
arch/arc/boot/dts/abilis_tb101.dtsi
+14
-18
arch/arc/boot/dts/abilis_tb101.dtsi
···
21
21
22
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
26
clock-frequency = <500000000>; /* 500 MHZ */
···
178
182
interrupt-controller;
179
183
#interrupt-cells = <1>;
180
184
interrupt-parent = <&tb10x_ictl>;
181
-
interrupts = <27 1>;
185
+
interrupts = <27 2>;
182
186
reg = <0xFF140000 0x1000>;
183
187
gpio-controller;
184
188
#gpio-cells = <1>;
···
190
194
interrupt-controller;
191
195
#interrupt-cells = <1>;
192
196
interrupt-parent = <&tb10x_ictl>;
193
-
interrupts = <27 1>;
197
+
interrupts = <27 2>;
194
198
reg = <0xFF141000 0x1000>;
195
199
gpio-controller;
196
200
#gpio-cells = <1>;
···
202
206
interrupt-controller;
203
207
#interrupt-cells = <1>;
204
208
interrupt-parent = <&tb10x_ictl>;
205
-
interrupts = <27 1>;
209
+
interrupts = <27 2>;
206
210
reg = <0xFF142000 0x1000>;
207
211
gpio-controller;
208
212
#gpio-cells = <1>;
···
214
218
interrupt-controller;
215
219
#interrupt-cells = <1>;
216
220
interrupt-parent = <&tb10x_ictl>;
217
-
interrupts = <27 1>;
221
+
interrupts = <27 2>;
218
222
reg = <0xFF143000 0x1000>;
219
223
gpio-controller;
220
224
#gpio-cells = <1>;
···
226
230
interrupt-controller;
227
231
#interrupt-cells = <1>;
228
232
interrupt-parent = <&tb10x_ictl>;
229
-
interrupts = <27 1>;
233
+
interrupts = <27 2>;
230
234
reg = <0xFF144000 0x1000>;
231
235
gpio-controller;
232
236
#gpio-cells = <1>;
···
238
242
interrupt-controller;
239
243
#interrupt-cells = <1>;
240
244
interrupt-parent = <&tb10x_ictl>;
241
-
interrupts = <27 1>;
245
+
interrupts = <27 2>;
242
246
reg = <0xFF145000 0x1000>;
243
247
gpio-controller;
244
248
#gpio-cells = <1>;
···
250
254
interrupt-controller;
251
255
#interrupt-cells = <1>;
252
256
interrupt-parent = <&tb10x_ictl>;
253
-
interrupts = <27 1>;
257
+
interrupts = <27 2>;
254
258
reg = <0xFF146000 0x1000>;
255
259
gpio-controller;
256
260
#gpio-cells = <1>;
···
262
266
interrupt-controller;
263
267
#interrupt-cells = <1>;
264
268
interrupt-parent = <&tb10x_ictl>;
265
-
interrupts = <27 1>;
269
+
interrupts = <27 2>;
266
270
reg = <0xFF147000 0x1000>;
267
271
gpio-controller;
268
272
#gpio-cells = <1>;
···
274
278
interrupt-controller;
275
279
#interrupt-cells = <1>;
276
280
interrupt-parent = <&tb10x_ictl>;
277
-
interrupts = <27 1>;
281
+
interrupts = <27 2>;
278
282
reg = <0xFF148000 0x1000>;
279
283
gpio-controller;
280
284
#gpio-cells = <1>;
···
286
290
interrupt-controller;
287
291
#interrupt-cells = <1>;
288
292
interrupt-parent = <&tb10x_ictl>;
289
-
interrupts = <27 1>;
293
+
interrupts = <27 2>;
290
294
reg = <0xFF149000 0x1000>;
291
295
gpio-controller;
292
296
#gpio-cells = <1>;
···
298
302
interrupt-controller;
299
303
#interrupt-cells = <1>;
300
304
interrupt-parent = <&tb10x_ictl>;
301
-
interrupts = <27 1>;
305
+
interrupts = <27 2>;
302
306
reg = <0xFF14A000 0x1000>;
303
307
gpio-controller;
304
308
#gpio-cells = <1>;
···
310
314
interrupt-controller;
311
315
#interrupt-cells = <1>;
312
316
interrupt-parent = <&tb10x_ictl>;
313
-
interrupts = <27 1>;
317
+
interrupts = <27 2>;
314
318
reg = <0xFF14B000 0x1000>;
315
319
gpio-controller;
316
320
#gpio-cells = <1>;
···
322
326
interrupt-controller;
323
327
#interrupt-cells = <1>;
324
328
interrupt-parent = <&tb10x_ictl>;
325
-
interrupts = <27 1>;
329
+
interrupts = <27 2>;
326
330
reg = <0xFF14C000 0x1000>;
327
331
gpio-controller;
328
332
#gpio-cells = <1>;
···
334
338
interrupt-controller;
335
339
#interrupt-cells = <1>;
336
340
interrupt-parent = <&tb10x_ictl>;
337
-
interrupts = <27 1>;
341
+
interrupts = <27 2>;
338
342
reg = <0xFF14D000 0x1000>;
339
343
gpio-controller;
340
344
#gpio-cells = <1>;
+14
-18
arch/arc/boot/dts/abilis_tb10x.dtsi
+14
-18
arch/arc/boot/dts/abilis_tb10x.dtsi
···
19
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
24
compatible = "abilis,arc-tb10x";
···
74
78
#interrupt-cells = <1>;
75
79
};
76
80
tb10x_ictl: pic@fe002000 {
77
-
compatible = "abilis,tb10x_ictl";
81
+
compatible = "abilis,tb10x-ictl";
78
82
reg = <0xFE002000 0x20>;
79
83
interrupt-controller;
80
84
#interrupt-cells = <2>;
···
87
91
compatible = "snps,dw-apb-uart";
88
92
reg = <0xFF100000 0x100>;
89
93
clock-frequency = <166666666>;
90
-
interrupts = <25 1>;
94
+
interrupts = <25 8>;
91
95
reg-shift = <2>;
92
96
reg-io-width = <4>;
93
97
interrupt-parent = <&tb10x_ictl>;
···
96
100
compatible = "snps,dwmac-3.70a","snps,dwmac";
97
101
reg = <0xFE100000 0x1058>;
98
102
interrupt-parent = <&tb10x_ictl>;
99
-
interrupts = <6 1>;
103
+
interrupts = <6 8>;
100
104
interrupt-names = "macirq";
101
105
clocks = <&ahb_clk>;
102
106
clock-names = "stmmaceth";
···
105
109
compatible = "snps,dma-spear1340";
106
110
reg = <0xFE000000 0x400>;
107
111
interrupt-parent = <&tb10x_ictl>;
108
-
interrupts = <14 1>;
112
+
interrupts = <14 8>;
109
113
dma-channels = <6>;
110
114
dma-requests = <0>;
111
115
dma-masters = <1>;
···
124
128
compatible = "snps,designware-i2c";
125
129
reg = <0xFF120000 0x1000>;
126
130
interrupt-parent = <&tb10x_ictl>;
127
-
interrupts = <12 1>;
131
+
interrupts = <12 8>;
128
132
clocks = <&ahb_clk>;
129
133
};
130
134
i2c1: i2c@FF121000 {
···
133
137
compatible = "snps,designware-i2c";
134
138
reg = <0xFF121000 0x1000>;
135
139
interrupt-parent = <&tb10x_ictl>;
136
-
interrupts = <12 1>;
140
+
interrupts = <12 8>;
137
141
clocks = <&ahb_clk>;
138
142
};
139
143
i2c2: i2c@FF122000 {
···
142
146
compatible = "snps,designware-i2c";
143
147
reg = <0xFF122000 0x1000>;
144
148
interrupt-parent = <&tb10x_ictl>;
145
-
interrupts = <12 1>;
149
+
interrupts = <12 8>;
146
150
clocks = <&ahb_clk>;
147
151
};
148
152
i2c3: i2c@FF123000 {
···
151
155
compatible = "snps,designware-i2c";
152
156
reg = <0xFF123000 0x1000>;
153
157
interrupt-parent = <&tb10x_ictl>;
154
-
interrupts = <12 1>;
158
+
interrupts = <12 8>;
155
159
clocks = <&ahb_clk>;
156
160
};
157
161
i2c4: i2c@FF124000 {
···
160
164
compatible = "snps,designware-i2c";
161
165
reg = <0xFF124000 0x1000>;
162
166
interrupt-parent = <&tb10x_ictl>;
163
-
interrupts = <12 1>;
167
+
interrupts = <12 8>;
164
168
clocks = <&ahb_clk>;
165
169
};
166
170
···
172
176
num-cs = <1>;
173
177
reg = <0xFE010000 0x20>;
174
178
interrupt-parent = <&tb10x_ictl>;
175
-
interrupts = <26 1>;
179
+
interrupts = <26 8>;
176
180
clocks = <&ahb_clk>;
177
181
};
178
182
spi1: spi@0xFE011000 {
···
183
187
num-cs = <2>;
184
188
reg = <0xFE011000 0x20>;
185
189
interrupt-parent = <&tb10x_ictl>;
186
-
interrupts = <10 1>;
190
+
interrupts = <10 8>;
187
191
clocks = <&ahb_clk>;
188
192
};
189
193
···
191
195
compatible = "abilis,tb100-tsm";
192
196
reg = <0xff316000 0x400>;
193
197
interrupt-parent = <&tb10x_ictl>;
194
-
interrupts = <17 1>;
198
+
interrupts = <17 8>;
195
199
output-clkdiv = <4>;
196
200
global-packet-delay = <0x21>;
197
201
port-packet-delay = <0>;
···
209
213
"cpuctrl",
210
214
"a6it_int_force";
211
215
interrupt-parent = <&tb10x_ictl>;
212
-
interrupts = <20 1>, <19 1>;
216
+
interrupts = <20 2>, <19 2>;
213
217
interrupt-names = "cmd_irq", "event_irq";
214
218
};
215
219
tb10x_mdsc0: tb10x-mdscr@FF300000 {
···
235
239
compatible = "abilis,tb100-wfb";
236
240
reg = <0xff319000 0x1000>;
237
241
interrupt-parent = <&tb10x_ictl>;
238
-
interrupts = <16 1>;
242
+
interrupts = <16 8>;
239
243
};
240
244
};
241
245
};
+16
arch/arc/boot/dts/angel4.dts
+16
arch/arc/boot/dts/angel4.dts
···
51
51
current-speed = <115200>;
52
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
};
+3
arch/arc/configs/fpga_defconfig
+3
arch/arc/configs/fpga_defconfig
···
38
38
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39
39
# CONFIG_FIRMWARE_IN_KERNEL is not set
40
40
# CONFIG_BLK_DEV is not set
41
+
CONFIG_NETDEVICES=y
42
+
CONFIG_ARC_EMAC=y
43
+
CONFIG_LXT_PHY=y
41
44
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
42
45
# CONFIG_INPUT_KEYBOARD is not set
43
46
# CONFIG_INPUT_MOUSE is not set
-2
arch/arc/plat-arcfpga/include/plat/irq.h
-2
arch/arc/plat-arcfpga/include/plat/irq.h
-2
arch/arc/plat-arcfpga/include/plat/memmap.h
-2
arch/arc/plat-arcfpga/include/plat/memmap.h