ar71xx: merge new board patches into the generic patch
[openwrt.git] / target / linux / ar71xx / patches-3.3 / 610-MIPS-ath79-openwrt-machines.patch
1 --- a/arch/mips/ath79/machtypes.h
2 +++ b/arch/mips/ath79/machtypes.h
3 @@ -16,18 +16,91 @@
4  
5  enum ath79_mach_type {
6         ATH79_MACH_GENERIC = 0,
7 +       ATH79_MACH_ALFA_AP96,           /* ALFA Network AP96 board */
8 +       ATH79_MACH_ALFA_NX,             /* ALFA Network N2/N5 board */
9 +       ATH79_MACH_ALL0258N,            /* Allnet ALL0258N */
10 +       ATH79_MACH_AP113,               /* Atheros AP113 reference board */
11         ATH79_MACH_AP121,               /* Atheros AP121 reference board */
12         ATH79_MACH_AP121_MINI,          /* Atheros AP121-MINI reference board */
13         ATH79_MACH_AP136,               /* Atheros AP136 reference board */
14         ATH79_MACH_AP81,                /* Atheros AP81 reference board */
15 +       ATH79_MACH_AP83,                /* Atheros AP83 */
16 +       ATH79_MACH_AP96,                /* Atheros AP96 */
17 +       ATH79_MACH_AW_NR580,            /* AzureWave AW-NR580 */
18         ATH79_MACH_DB120,               /* Atheros DB120 reference board */
19         ATH79_MACH_PB44,                /* Atheros PB44 reference board */
20 +       ATH79_MACH_DIR_600_A1,          /* D-Link DIR-600 rev. A1 */
21 +       ATH79_MACH_DIR_615_C1,          /* D-Link DIR-615 rev. C1 */
22 +       ATH79_MACH_DIR_615_E4,          /* D-Link DIR-615 rev. E4 */
23 +       ATH79_MACH_DIR_825_B1,          /* D-Link DIR-825 rev. B1 */
24 +       ATH79_MACH_EW_DORIN,            /* embedded wireless Dorin Platform */
25 +       ATH79_MACH_EAP7660D,            /* Senao EAP7660D */
26 +       ATH79_MACH_JA76PF,              /* jjPlus JA76PF */
27 +       ATH79_MACH_JA76PF2,             /* jjPlus JA76PF2 */
28 +       ATH79_MACH_JWAP003,             /* jjPlus JWAP003 */
29 +       ATH79_MACH_HORNET_UB,           /* ALFA Networks Hornet-UB */
30 +       ATH79_MACH_MZK_W04NU,           /* Planex MZK-W04NU */
31 +       ATH79_MACH_MZK_W300NH,          /* Planex MZK-W300NH */
32 +       ATH79_MACH_NBG460N,             /* Zyxel NBG460N/550N/550NH */
33 +       ATH79_MACH_OM2P_LC,             /* OpenMesh OM2P-LC */
34 +       ATH79_MACH_OM2P,                /* OpenMesh OM2P */
35 +       ATH79_MACH_PB42,                /* Atheros PB42 */
36 +       ATH79_MACH_PB92,                /* Atheros PB92 */
37 +       ATH79_MACH_RB_411,              /* MikroTik RouterBOARD 411/411A/411AH */
38 +       ATH79_MACH_RB_411U,             /* MikroTik RouterBOARD 411U */
39 +       ATH79_MACH_RB_433,              /* MikroTik RouterBOARD 433/433AH */
40 +       ATH79_MACH_RB_433U,             /* MikroTik RouterBOARD 433UAH */
41 +       ATH79_MACH_RB_450G,             /* MikroTik RouterBOARD 450G */
42 +       ATH79_MACH_RB_450,              /* MikroTik RouterBOARD 450 */
43 +       ATH79_MACH_RB_493,              /* Mikrotik RouterBOARD 493/493AH */
44 +       ATH79_MACH_RB_493G,             /* Mikrotik RouterBOARD 493G */
45 +       ATH79_MACH_RB_750,              /* MikroTik RouterBOARD 750 */
46 +       ATH79_MACH_RB_750G_R3,          /* MikroTik RouterBOARD 750GL */
47 +       ATH79_MACH_RB_751,              /* MikroTik RouterBOARD 751 */
48 +       ATH79_MACH_RB_751G,             /* Mikrotik RouterBOARD 751G */
49 +       ATH79_MACH_RW2458N,             /* Redwave RW2458N */
50 +       ATH79_MACH_TEW_632BRP,          /* TRENDnet TEW-632BRP */
51 +       ATH79_MACH_TEW_673GRU,          /* TRENDnet TEW-673GRU */
52 +       ATH79_MACH_TL_MR11U,            /* TP-LINK TL-MR11U */
53 +       ATH79_MACH_TL_MR3020,           /* TP-LINK TL-MR3020 */
54 +       ATH79_MACH_TL_MR3220,           /* TP-LINK TL-MR3220 */
55 +       ATH79_MACH_TL_MR3420,           /* TP-LINK TL-MR3420 */
56 +       ATH79_MACH_TL_WA901ND,          /* TP-LINK TL-WA901ND */
57 +       ATH79_MACH_TL_WA901ND_V2,       /* TP-LINK TL-WA901ND v2 */
58 +       ATH79_MACH_TL_WDR4300,          /* TP-LINK TL-WDR4300 */
59 +       ATH79_MACH_TL_WR1041N_V2,       /* TP-LINK TL-WR1041N v2 */
60 +       ATH79_MACH_TL_WR1043ND,         /* TP-LINK TL-WR1043ND */
61 +       ATH79_MACH_TL_WR2543N,          /* TP-LINK TL-WR2543N/ND */
62 +       ATH79_MACH_TL_WR703N,           /* TP-LINK TL-WR703N */
63 +       ATH79_MACH_TL_WR741ND,          /* TP-LINK TL-WR741ND */
64 +       ATH79_MACH_TL_WR741ND_V4,       /* TP-LINK TL-WR741ND  v4*/
65 +       ATH79_MACH_TL_WR841N_V1,        /* TP-LINK TL-WR841N v1 */
66 +       ATH79_MACH_TL_WR841N_V7,        /* TP-LINK TL-WR841N/ND v7 */
67 +       ATH79_MACH_TL_WR941ND,          /* TP-LINK TL-WR941ND */
68         ATH79_MACH_UBNT_AIRROUTER,      /* Ubiquiti AirRouter */
69         ATH79_MACH_UBNT_BULLET_M,       /* Ubiquiti Bullet M */
70 +       ATH79_MACH_UBNT_LSSR71,         /* Ubiquiti LS-SR71 */
71 +       ATH79_MACH_UBNT_LSX,            /* Ubiquiti LSX */
72         ATH79_MACH_UBNT_NANO_M,         /* Ubiquiti NanoStation M */
73         ATH79_MACH_UBNT_ROCKET_M,       /* Ubiquiti Rocket M */
74 +       ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
75 +       ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */
76         ATH79_MACH_UBNT_UNIFI,          /* Ubiquiti Unifi */
77         ATH79_MACH_UBNT_XM,             /* Ubiquiti Networks XM board rev 1.0 */
78 +       ATH79_MACH_WHR_G301N,           /* Buffalo WHR-G301N */
79 +       ATH79_MACH_WHR_HP_G300N,        /* Buffalo WHR-HP-G300N */
80 +       ATH79_MACH_WHR_HP_GN,           /* Buffalo WHR-HP-GN */
81 +       ATH79_MACH_WNDR3700,            /* NETGEAR WNDR3700/WNDR3800/WNDRMAC */
82 +       ATH79_MACH_WNR2000,             /* NETGEAR WNR2000 */
83 +       ATH79_MACH_WP543,               /* Compex WP543 */
84 +       ATH79_MACH_WPE72,               /* Compex WPE72 */
85 +       ATH79_MACH_WRT160NL,            /* Linksys WRT160NL */
86 +       ATH79_MACH_WRT400N,             /* Linksys WRT400N */
87 +       ATH79_MACH_WZR_HP_AG300H,       /* Buffalo WZR-HP-AG300H */
88 +       ATH79_MACH_WZR_HP_G300NH,       /* Buffalo WZR-HP-G300NH */
89 +       ATH79_MACH_WZR_HP_G300NH2,      /* Buffalo WZR-HP-G300NH2 */
90 +       ATH79_MACH_WZR_HP_G450H,        /* Buffalo WZR-HP-G450H */
91 +       ATH79_MACH_ZCN_1523H_2,         /* Zcomax ZCN-1523H-2-xx */
92  };
93  
94  #endif /* _ATH79_MACHTYPE_H */
95 --- a/arch/mips/ath79/Kconfig
96 +++ b/arch/mips/ath79/Kconfig
97 @@ -2,6 +2,52 @@ if ATH79
98  
99  menu "Atheros AR71XX/AR724X/AR913X machine selection"
100  
101 +config ATH79_MACH_ALFA_AP96
102 +       bool "ALFA Network AP96 board support"
103 +       select SOC_AR71XX
104 +       select ATH79_DEV_ETH
105 +       select ATH79_DEV_GPIO_BUTTONS
106 +       select ATH79_DEV_SPI
107 +       select ATH79_DEV_USB
108 +
109 +config ATH79_MACH_HORNET_UB
110 +       bool "ALFA Network Hornet-UB board support"
111 +       select SOC_AR933X
112 +       select ATH79_DEV_ETH
113 +       select ATH79_DEV_GPIO_BUTTONS
114 +       select ATH79_DEV_LEDS_GPIO
115 +       select ATH79_DEV_M25P80
116 +       select ATH79_DEV_USB
117 +       select ATH79_DEV_WMAC
118 +
119 +config ATH79_MACH_ALFA_NX
120 +       bool "ALFA Network N2/N5 board support"
121 +       select SOC_AR724X
122 +       select ATH79_DEV_AP9X_PCI if PCI
123 +       select ATH79_DEV_ETH
124 +       select ATH79_DEV_GPIO_BUTTONS
125 +       select ATH79_DEV_LEDS_GPIO
126 +       select ATH79_DEV_M25P80
127 +
128 +config ATH79_MACH_ALL0258N
129 +       bool "Allnet ALL0258N support"
130 +       select SOC_AR724X
131 +       select ATH79_DEV_AP9X_PCI if PCI
132 +       select ATH79_DEV_ETH
133 +       select ATH79_DEV_GPIO_BUTTONS
134 +       select ATH79_DEV_LEDS_GPIO
135 +       select ATH79_DEV_M25P80
136 +
137 +config ATH79_MACH_AP113
138 +       bool "Atheros AP113 board support"
139 +       select SOC_AR724X
140 +       select ATH79_DEV_M25P80
141 +       select ATH79_DEV_PB9X_PCI if PCI
142 +       select ATH79_DEV_GPIO_BUTTONS
143 +       select ATH79_DEV_LEDS_GPIO
144 +       select ATH79_DEV_USB
145 +       select ATH79_DEV_ETH
146 +
147  config ATH79_MACH_AP121
148         bool "Atheros AP121 reference board"
149         select SOC_AR933X
150 @@ -40,6 +86,24 @@ config ATH79_MACH_AP81
151           Say 'Y' here if you want your kernel to support the
152           Atheros AP81 reference board.
153  
154 +config ATH79_MACH_AP83
155 +       bool "Atheros AP83 board support"
156 +       select SOC_AR913X
157 +       select ATH79_DEV_GPIO_BUTTONS
158 +       select ATH79_DEV_LEDS_GPIO
159 +       select ATH79_DEV_USB
160 +       select ATH79_DEV_WMAC
161 +
162 +config ATH79_MACH_AP96
163 +       bool "Atheros AP96 board support"
164 +       select SOC_AR71XX
165 +       select ATH79_DEV_ETH
166 +       select ATH79_DEV_AP9X_PCI if PCI
167 +       select ATH79_DEV_GPIO_BUTTONS
168 +       select ATH79_DEV_LEDS_GPIO
169 +       select ATH79_DEV_M25P80
170 +       select ATH79_DEV_USB
171 +
172  config ATH79_MACH_DB120
173         bool "Atheros DB120 reference board"
174         select SOC_AR934X
175 @@ -54,6 +118,13 @@ config ATH79_MACH_DB120
176           Say 'Y' here if you want your kernel to support the
177           Atheros DB120 reference board.
178  
179 +config ATH79_MACH_PB42
180 +       bool "Atheros PB42 board support"
181 +       select SOC_AR71XX
182 +       select ATH79_DEV_ETH
183 +       select ATH79_DEV_GPIO_BUTTONS
184 +       select ATH79_DEV_M25P80
185 +
186  config ATH79_MACH_PB44
187         bool "Atheros PB44 reference board"
188         select SOC_AR71XX
189 @@ -66,6 +137,416 @@ config ATH79_MACH_PB44
190           Say 'Y' here if you want your kernel to support the
191           Atheros PB44 reference board.
192  
193 +config ATH79_MACH_PB92
194 +       bool "Atheros PB92 board support"
195 +       select SOC_AR724X
196 +       select ATH79_DEV_ETH
197 +       select ATH79_DEV_GPIO_BUTTONS
198 +       select ATH79_DEV_LEDS_GPIO
199 +       select ATH79_DEV_PB9X_PCI if PCI
200 +       select ATH79_DEV_USB
201 +
202 +config ATH79_MACH_AW_NR580
203 +       bool "AzureWave AW-NR580 board support"
204 +       select SOC_AR71XX
205 +       select ATH79_DEV_ETH
206 +       select ATH79_DEV_GPIO_BUTTONS
207 +       select ATH79_DEV_LEDS_GPIO
208 +       select ATH79_DEV_M25P80
209 +
210 +config ATH79_MACH_WHR_HP_G300N
211 +       bool "Buffalo WHR-HP-G300N board support"
212 +       select SOC_AR724X
213 +       select ATH79_DEV_ETH
214 +       select ATH79_DEV_AP9X_PCI if PCI
215 +       select ATH79_DEV_GPIO_BUTTONS
216 +       select ATH79_DEV_LEDS_GPIO
217 +       select ATH79_DEV_M25P80
218 +
219 +config ATH79_MACH_WZR_HP_AG300H
220 +       bool "Buffalo WZR-HP-AG300H board support"
221 +       select SOC_AR71XX
222 +       select ATH79_DEV_ETH
223 +       select ATH79_DEV_GPIO_BUTTONS
224 +       select ATH79_DEV_LEDS_GPIO
225 +       select ATH79_DEV_M25P80
226 +       select ATH79_DEV_USB
227 +
228 +config ATH79_MACH_WZR_HP_G300NH
229 +       bool "Buffalo WZR-HP-G300NH board support"
230 +       select SOC_AR913X
231 +       select ATH79_DEV_ETH
232 +       select ATH79_DEV_GPIO_BUTTONS
233 +       select ATH79_DEV_LEDS_GPIO
234 +       select ATH79_DEV_USB
235 +       select ATH79_DEV_WMAC
236 +       select RTL8366_SMI
237 +
238 +config ATH79_MACH_WZR_HP_G300NH2
239 +       bool "Buffalo WZR-HP-G300NH2 board support"
240 +       select SOC_AR724X
241 +       select ATH79_DEV_AP9X_PCI if PCI
242 +       select ATH79_DEV_ETH
243 +       select ATH79_DEV_GPIO_BUTTONS
244 +       select ATH79_DEV_LEDS_GPIO
245 +       select ATH79_DEV_M25P80
246 +       select ATH79_DEV_USB
247 +
248 +config ATH79_MACH_WZR_HP_G450H
249 +       bool "Buffalo WZR-HP-G450H board support"
250 +       select SOC_AR724X
251 +       select ATH79_DEV_ETH
252 +       select ATH79_DEV_AP9X_PCI if PCI
253 +       select ATH79_DEV_GPIO_BUTTONS
254 +       select ATH79_DEV_LEDS_GPIO
255 +       select ATH79_DEV_M25P80
256 +       select ATH79_DEV_USB
257 +
258 +config ATH79_MACH_WP543
259 +       bool "Compex WP543/WPJ543 board support"
260 +       select SOC_AR71XX
261 +       select ATH79_DEV_ETH
262 +       select ATH79_DEV_GPIO_BUTTONS
263 +       select ATH79_DEV_LEDS_GPIO
264 +       select ATH79_DEV_M25P80
265 +       select ATH79_DEV_USB
266 +       select MYLOADER
267 +
268 +config ATH79_MACH_WPE72
269 +       bool "Compex WPE72/WPE72NX board support"
270 +       select SOC_AR724X
271 +       select ATH79_DEV_ETH
272 +       select ATH79_DEV_GPIO_BUTTONS
273 +       select ATH79_DEV_LEDS_GPIO
274 +       select ATH79_DEV_M25P80
275 +       select ATH79_DEV_USB
276 +       select MYLOADER
277 +
278 +config ATH79_MACH_DIR_600_A1
279 +       bool "D-Link DIR-600 A1/DIR-615 E4 support"
280 +       select SOC_AR724X
281 +       select ATH79_DEV_AP9X_PCI if PCI
282 +       select ATH79_DEV_ETH
283 +       select ATH79_DEV_GPIO_BUTTONS
284 +       select ATH79_DEV_LEDS_GPIO
285 +       select ATH79_DEV_M25P80
286 +       select ATH79_NVRAM
287 +
288 +config ATH79_MACH_DIR_615_C1
289 +       bool "D-Link DIR-615 rev. C1 support"
290 +       select SOC_AR913X
291 +       select ATH79_DEV_ETH
292 +       select ATH79_DEV_GPIO_BUTTONS
293 +       select ATH79_DEV_LEDS_GPIO
294 +       select ATH79_DEV_M25P80
295 +       select ATH79_DEV_WMAC
296 +       select ATH79_NVRAM
297 +
298 +config ATH79_MACH_DIR_825_B1
299 +       bool "D-Link DIR-825 rev. B1 board support"
300 +       select SOC_AR71XX
301 +       select ATH79_DEV_ETH
302 +       select ATH79_DEV_AP9X_PCI if PCI
303 +       select ATH79_DEV_GPIO_BUTTONS
304 +       select ATH79_DEV_LEDS_GPIO
305 +       select ATH79_DEV_M25P80
306 +       select ATH79_DEV_USB
307 +
308 +config ATH79_MACH_EW_DORIN
309 +       bool "embedded wireless Dorin Platform support"
310 +       select SOC_AR933X
311 +       select ATH79_DEV_M25P80
312 +       select ATH79_DEV_GPIO_BUTTONS
313 +       select ATH79_DEV_LEDS_GPIO
314 +       select ATH79_DEV_WMAC
315 +       select ATH79_DEV_ETH
316 +       help
317 +         Say 'Y' here if you want your kernel to support the
318 +         Dorin Platform from www.80211.de .
319 +
320 +config ATH79_MACH_JA76PF
321 +       bool "jjPlus JA76PF board support"
322 +       select SOC_AR71XX
323 +       select ATH79_DEV_ETH
324 +       select ATH79_DEV_GPIO_BUTTONS
325 +       select ATH79_DEV_LEDS_GPIO
326 +       select ATH79_DEV_M25P80
327 +       select ATH79_DEV_USB
328 +
329 +config ATH79_MACH_JWAP003
330 +       bool "jjPlus JWAP003 board support"
331 +       select SOC_AR71XX
332 +       select ATH79_DEV_ETH
333 +       select ATH79_DEV_GPIO_BUTTONS
334 +       select ATH79_DEV_M25P80
335 +       select ATH79_DEV_USB
336 +
337 +config ATH79_MACH_WRT160NL
338 +       bool "Linksys WRT160NL board support"
339 +       select SOC_AR913X
340 +       select ATH79_DEV_ETH
341 +       select ATH79_DEV_GPIO_BUTTONS
342 +       select ATH79_DEV_LEDS_GPIO
343 +       select ATH79_DEV_M25P80
344 +       select ATH79_DEV_USB
345 +       select ATH79_DEV_WMAC
346 +       select ATH79_NVRAM
347 +
348 +config ATH79_MACH_WRT400N
349 +       bool "Linksys WRT400N board support"
350 +       select SOC_AR71XX
351 +       select ATH79_DEV_ETH
352 +       select ATH79_DEV_AP9X_PCI if PCI
353 +       select ATH79_DEV_GPIO_BUTTONS
354 +       select ATH79_DEV_LEDS_GPIO
355 +
356 +config ATH79_MACH_RB4XX
357 +       bool "MikroTik RouterBOARD 4xx series support"
358 +       select SOC_AR71XX
359 +       select ATH79_DEV_ETH
360 +       select ATH79_DEV_GPIO_BUTTONS
361 +       select ATH79_DEV_LEDS_GPIO
362 +       select ATH79_DEV_USB
363 +
364 +config ATH79_MACH_RB750
365 +       bool "MikroTik RouterBOARD 750 support"
366 +       select SOC_AR724X
367 +       select ATH79_DEV_ETH
368 +       select ATH79_DEV_AP9X_PCI if PCI
369 +       select ATH79_DEV_USB
370 +
371 +config ATH79_MACH_WNDR3700
372 +       bool "NETGEAR WNDR3700 board support"
373 +       select SOC_AR71XX
374 +       select ATH79_DEV_AP9X_PCI if PCI
375 +       select ATH79_DEV_ETH
376 +       select ATH79_DEV_GPIO_BUTTONS
377 +       select ATH79_DEV_LEDS_GPIO
378 +       select ATH79_DEV_M25P80
379 +       select ATH79_DEV_USB
380 +
381 +config ATH79_MACH_WNR2000
382 +       bool "NETGEAR WNR2000 board support"
383 +       select SOC_AR913X
384 +       select ATH79_DEV_ETH
385 +       select ATH79_DEV_GPIO_BUTTONS
386 +       select ATH79_DEV_LEDS_GPIO
387 +       select ATH79_DEV_M25P80
388 +       select ATH79_DEV_WMAC
389 +
390 +config ATH79_MACH_OM2P
391 +       bool "OpenMesh OM2P board support"
392 +       select SOC_AR724X
393 +       select ATH79_DEV_AP9X_PCI if PCI
394 +       select ATH79_DEV_ETH
395 +       select ATH79_DEV_GPIO_BUTTONS
396 +       select ATH79_DEV_LEDS_GPIO
397 +       select ATH79_DEV_M25P80
398 +
399 +config ATH79_MACH_MZK_W04NU
400 +       bool "Planex MZK-W04NU board support"
401 +       select SOC_AR913X
402 +       select ATH79_DEV_ETH
403 +       select ATH79_DEV_GPIO_BUTTONS
404 +       select ATH79_DEV_LEDS_GPIO
405 +       select ATH79_DEV_M25P80
406 +       select ATH79_DEV_USB
407 +       select ATH79_DEV_WMAC
408 +
409 +config ATH79_MACH_MZK_W300NH
410 +       bool "Planex MZK-W300NH board support"
411 +       select SOC_AR913X
412 +       select ATH79_DEV_ETH
413 +       select ATH79_DEV_GPIO_BUTTONS
414 +       select ATH79_DEV_LEDS_GPIO
415 +       select ATH79_DEV_M25P80
416 +       select ATH79_DEV_WMAC
417 +
418 +config ATH79_MACH_RW2458N
419 +       bool "Redwave RW2458N board support"
420 +       select SOC_AR724X
421 +       select ATH79_DEV_ETH
422 +       select ATH79_DEV_AP9X_PCI if PCI
423 +       select ATH79_DEV_GPIO_BUTTONS
424 +       select ATH79_DEV_LEDS_GPIO
425 +       select ATH79_DEV_M25P80
426 +       select ATH79_DEV_USB
427 +
428 +config ATH79_MACH_EAP7660D
429 +       bool "Senao EAP7660D support"
430 +       select SOC_AR71XX
431 +       select ATH79_DEV_ETH
432 +       select ATH79_DEV_GPIO_BUTTONS
433 +       select ATH79_DEV_LEDS_GPIO
434 +       select ATH79_DEV_M25P80
435 +
436 +config ATH79_MACH_TL_MR11U
437 +       bool "TP-LINK TL-MR11U support"
438 +       select SOC_AR933X
439 +       select ATH79_DEV_ETH
440 +       select ATH79_DEV_GPIO_BUTTONS
441 +       select ATH79_DEV_LEDS_GPIO
442 +       select ATH79_DEV_M25P80
443 +       select ATH79_DEV_USB
444 +       select ATH79_DEV_WMAC
445 +
446 +config ATH79_MACH_TL_MR3020
447 +       bool "TP-LINK TL-MR3020 support"
448 +       select SOC_AR933X
449 +       select ATH79_DEV_ETH
450 +       select ATH79_DEV_GPIO_BUTTONS
451 +       select ATH79_DEV_LEDS_GPIO
452 +       select ATH79_DEV_M25P80
453 +       select ATH79_DEV_USB
454 +       select ATH79_DEV_WMAC
455 +
456 +config ATH79_MACH_TL_MR3X20
457 +       bool "TP-LINK TL-MR3220/3420 support"
458 +       select SOC_AR724X
459 +       select ATH79_DEV_AP9X_PCI if PCI
460 +       select ATH79_DEV_ETH
461 +       select ATH79_DEV_GPIO_BUTTONS
462 +       select ATH79_DEV_LEDS_GPIO
463 +       select ATH79_DEV_M25P80
464 +       select ATH79_DEV_USB
465 +
466 +config ATH79_MACH_TL_WA901ND
467 +       bool "TP-LINK TL-WA901ND support"
468 +       select SOC_AR724X
469 +       select ATH79_DEV_AP9X_PCI if PCI
470 +       select ATH79_DEV_ETH
471 +       select ATH79_DEV_GPIO_BUTTONS
472 +       select ATH79_DEV_LEDS_GPIO
473 +       select ATH79_DEV_M25P80
474 +
475 +config ATH79_MACH_TL_WA901ND_V2
476 +       bool "TP-LINK TL-WA901ND v2 support"
477 +       select SOC_AR913X
478 +       select ATH79_DEV_ETH
479 +       select ATH79_DEV_GPIO_BUTTONS
480 +       select ATH79_DEV_LEDS_GPIO
481 +       select ATH79_DEV_M25P80
482 +       select ATH79_DEV_WMAC
483 +
484 +config ATH79_MACH_TL_WDR4300
485 +       bool "TP-LINK TL-WDR4300 board support"
486 +       select SOC_AR934X
487 +       select ATH79_DEV_AP9X_PCI if PCI
488 +       select ATH79_DEV_ETH
489 +       select ATH79_DEV_GPIO_BUTTONS
490 +       select ATH79_DEV_LEDS_GPIO
491 +       select ATH79_DEV_M25P80
492 +       select ATH79_DEV_USB
493 +       select ATH79_DEV_WMAC
494 +
495 +config ATH79_MACH_TL_WR703N
496 +       bool "TP-LINK TL-WR703N support"
497 +       select SOC_AR933X
498 +       select ATH79_DEV_ETH
499 +       select ATH79_DEV_GPIO_BUTTONS
500 +       select ATH79_DEV_LEDS_GPIO
501 +       select ATH79_DEV_M25P80
502 +       select ATH79_DEV_USB
503 +       select ATH79_DEV_WMAC
504 +
505 +config ATH79_MACH_TL_WR741ND
506 +       bool "TP-LINK TL-WR741ND support"
507 +       select SOC_AR724X
508 +       select ATH79_DEV_AP9X_PCI if PCI
509 +       select ATH79_DEV_ETH
510 +       select ATH79_DEV_GPIO_BUTTONS
511 +       select ATH79_DEV_LEDS_GPIO
512 +       select ATH79_DEV_M25P80
513 +
514 +config ATH79_MACH_TL_WR741ND_V4
515 +       bool "TP-LINK TL-WR741ND v4 support"
516 +       select SOC_AR933X
517 +       select ATH79_DEV_ETH
518 +       select ATH79_DEV_GPIO_BUTTONS
519 +       select ATH79_DEV_LEDS_GPIO
520 +       select ATH79_DEV_M25P80
521 +       select ATH79_DEV_WMAC
522 +
523 +config ATH79_MACH_TL_WR841N_V1
524 +       bool "TP-LINK TL-WR841N v1 support"
525 +       select SOC_AR71XX
526 +       select ATH79_DEV_DSA
527 +       select ATH79_DEV_ETH
528 +       select ATH79_DEV_GPIO_BUTTONS
529 +       select ATH79_DEV_LEDS_GPIO
530 +       select ATH79_DEV_M25P80
531 +
532 +config ATH79_MACH_TL_WR941ND
533 +       bool "TP-LINK TL-WR941ND support"
534 +       select SOC_AR913X
535 +       select ATH79_DEV_DSA
536 +       select ATH79_DEV_ETH
537 +       select ATH79_DEV_GPIO_BUTTONS
538 +       select ATH79_DEV_LEDS_GPIO
539 +       select ATH79_DEV_M25P80
540 +       select ATH79_DEV_WMAC
541 +
542 +config ATH79_MACH_TL_WR1041N_V2
543 +       bool "TP-LINK TL-WR1041N v2 support"
544 +       select SOC_AR934X
545 +       select ATH79_DEV_AP9X_PCI if PCI
546 +       select ATH79_DEV_ETH
547 +       select ATH79_DEV_GPIO_BUTTONS
548 +       select ATH79_DEV_LEDS_GPIO
549 +       select ATH79_DEV_M25P80
550 +       select ATH79_DEV_USB
551 +       select ATH79_DEV_WMAC
552 +
553 +config ATH79_MACH_TL_WR1043ND
554 +       bool "TP-LINK TL-WR1043ND support"
555 +       select SOC_AR913X
556 +       select ATH79_DEV_ETH
557 +       select ATH79_DEV_GPIO_BUTTONS
558 +       select ATH79_DEV_LEDS_GPIO
559 +       select ATH79_DEV_M25P80
560 +       select ATH79_DEV_USB
561 +       select ATH79_DEV_WMAC
562 +
563 +config ATH79_MACH_TL_WR2543N
564 +       bool "TP-LINK TL-WR2543N/ND support"
565 +       select SOC_AR724X
566 +       select ATH79_DEV_AP9X_PCI if PCI
567 +       select ATH79_DEV_ETH
568 +       select ATH79_DEV_GPIO_BUTTONS
569 +       select ATH79_DEV_LEDS_GPIO
570 +       select ATH79_DEV_M25P80
571 +       select ATH79_DEV_USB
572 +
573 +config ATH79_MACH_TEW_632BRP
574 +       bool "TRENDnet TEW-632BRP support"
575 +       select SOC_AR913X
576 +       select ATH79_DEV_ETH
577 +       select ATH79_DEV_GPIO_BUTTONS
578 +       select ATH79_DEV_LEDS_GPIO
579 +       select ATH79_DEV_M25P80
580 +       select ATH79_DEV_WMAC
581 +       select ATH79_NVRAM
582 +
583 +config ATH79_MACH_TEW_673GRU
584 +       bool "TRENDnet TEW-673GRU support"
585 +       select SOC_AR71XX
586 +       select ATH79_DEV_AP9X_PCI if PCI
587 +       select ATH79_DEV_ETH
588 +       select ATH79_DEV_GPIO_BUTTONS
589 +       select ATH79_DEV_LEDS_GPIO
590 +       select ATH79_DEV_M25P80
591 +       select ATH79_DEV_USB
592 +       select ATH79_NVRAM
593 +
594 +config ATH79_MACH_UBNT
595 +       bool "Ubiquiti AR71xx based boards support"
596 +       select SOC_AR71XX
597 +       select ATH79_DEV_ETH
598 +       select ATH79_DEV_GPIO_BUTTONS
599 +       select ATH79_DEV_LEDS_GPIO
600 +       select ATH79_DEV_M25P80
601 +       select ATH79_DEV_USB
602 +
603  config ATH79_MACH_UBNT_XM
604         bool "Ubiquiti Networks XM (rev 1.0) board"
605         select SOC_AR724X
606 @@ -79,6 +560,24 @@ config ATH79_MACH_UBNT_XM
607           Say 'Y' here if you want your kernel to support the
608           Ubiquiti Networks XM (rev 1.0) board.
609  
610 +config ATH79_MACH_ZCN_1523H
611 +       bool "Zcomax ZCN-1523H support"
612 +       select SOC_AR724X
613 +       select ATH79_DEV_AP9X_PCI if PCI
614 +       select ATH79_DEV_ETH
615 +       select ATH79_DEV_GPIO_BUTTONS
616 +       select ATH79_DEV_LEDS_GPIO
617 +       select ATH79_DEV_M25P80
618 +
619 +config ATH79_MACH_NBG460N
620 +       bool "Zyxel NBG460N/550N/550NH board support"
621 +       select SOC_AR913X
622 +       select ATH79_DEV_ETH
623 +       select ATH79_DEV_GPIO_BUTTONS
624 +       select ATH79_DEV_LEDS_GPIO
625 +       select ATH79_DEV_M25P80
626 +       select ATH79_DEV_WMAC
627 +
628  endmenu
629  
630  config SOC_AR71XX
631 @@ -114,10 +613,6 @@ config SOC_QCA955X
632         select PCI_AR724X if PCI
633         def_bool n
634  
635 -config ATH79_DEV_M25P80
636 -       select ATH79_DEV_SPI
637 -       def_bool n
638 -
639  config ATH79_DEV_AP9X_PCI
640         select ATH79_PCI_ATH9K_FIXUP
641         def_bool n
642 @@ -128,7 +623,14 @@ config ATH79_DEV_DSA
643  config ATH79_DEV_ETH
644         def_bool n
645  
646 -config PCI_AR724X
647 +config ATH79_DEV_M25P80
648 +       select ATH79_DEV_SPI
649 +       def_bool n
650 +
651 +config ATH79_DEV_DSA
652 +       def_bool n
653 +
654 +config ATH79_DEV_ETH
655         def_bool n
656  
657  config ATH79_DEV_GPIO_BUTTONS
658 @@ -153,4 +655,7 @@ config ATH79_NVRAM
659  config ATH79_PCI_ATH9K_FIXUP
660         def_bool n
661  
662 +config PCI_AR724X
663 +       def_bool n
664 +
665  endif
666 --- a/arch/mips/ath79/Makefile
667 +++ b/arch/mips/ath79/Makefile
668 @@ -36,9 +36,61 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP)  += p
669  #
670  # Machines
671  #
672 +obj-$(CONFIG_ATH79_MACH_ALFA_AP96)     += mach-alfa-ap96.o
673 +obj-$(CONFIG_ATH79_MACH_ALFA_NX)       += mach-alfa-nx.o
674 +obj-$(CONFIG_ATH79_MACH_ALL0258N)      += mach-all0258n.o
675 +obj-$(CONFIG_ATH79_MACH_AP113)         += mach-ap113.o
676  obj-$(CONFIG_ATH79_MACH_AP121)         += mach-ap121.o
677  obj-$(CONFIG_ATH79_MACH_AP136)         += mach-ap136.o
678  obj-$(CONFIG_ATH79_MACH_AP81)          += mach-ap81.o
679 +obj-$(CONFIG_ATH79_MACH_AP83)          += mach-ap83.o
680 +obj-$(CONFIG_ATH79_MACH_AP96)          += mach-ap96.o
681 +obj-$(CONFIG_ATH79_MACH_AW_NR580)      += mach-aw-nr580.o
682  obj-$(CONFIG_ATH79_MACH_DB120)         += mach-db120.o
683 +obj-$(CONFIG_ATH79_MACH_DIR_600_A1)    += mach-dir-600-a1.o
684 +obj-$(CONFIG_ATH79_MACH_DIR_615_C1)    += mach-dir-615-c1.o
685 +obj-$(CONFIG_ATH79_MACH_DIR_825_B1)    += mach-dir-825-b1.o
686 +obj-$(CONFIG_ATH79_MACH_EW_DORIN)      += mach-ew-dorin.o
687 +obj-$(CONFIG_ATH79_MACH_EAP7660D)      += mach-eap7660d.o
688 +obj-$(CONFIG_ATH79_MACH_JA76PF)                += mach-ja76pf.o
689 +obj-$(CONFIG_ATH79_MACH_JWAP003)       += mach-jwap003.o
690 +obj-$(CONFIG_ATH79_MACH_HORNET_UB)     += mach-hornet-ub.o
691 +obj-$(CONFIG_ATH79_MACH_MZK_W04NU)     += mach-mzk-w04nu.o
692 +obj-$(CONFIG_ATH79_MACH_MZK_W300NH)    += mach-mzk-w300nh.o
693 +obj-$(CONFIG_ATH79_MACH_NBG460N)       += mach-nbg460n.o
694 +obj-$(CONFIG_ATH79_MACH_OM2P)          += mach-om2p.o
695 +obj-$(CONFIG_ATH79_MACH_PB42)          += mach-pb42.o
696  obj-$(CONFIG_ATH79_MACH_PB44)          += mach-pb44.o
697 +obj-$(CONFIG_ATH79_MACH_PB92)          += mach-pb92.o
698 +obj-$(CONFIG_ATH79_MACH_RB4XX)         += mach-rb4xx.o
699 +obj-$(CONFIG_ATH79_MACH_RB750)         += mach-rb750.o
700 +obj-$(CONFIG_ATH79_MACH_RW2458N)       += mach-rw2458n.o
701 +obj-$(CONFIG_ATH79_MACH_TEW_632BRP)    += mach-tew-632brp.o
702 +obj-$(CONFIG_ATH79_MACH_TEW_673GRU)    += mach-tew-673gru.o
703 +obj-$(CONFIG_ATH79_MACH_TL_MR11U)      += mach-tl-mr11u.o
704 +obj-$(CONFIG_ATH79_MACH_TL_MR3020)     += mach-tl-mr3020.o
705 +obj-$(CONFIG_ATH79_MACH_TL_MR3X20)     += mach-tl-mr3x20.o
706 +obj-$(CONFIG_ATH79_MACH_TL_WA901ND)    += mach-tl-wa901nd.o
707 +obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o
708 +obj-$(CONFIG_ATH79_MACH_TL_WDR4300)     += mach-tl-wdr4300.o
709 +obj-$(CONFIG_ATH79_MACH_TL_WR741ND)    += mach-tl-wr741nd.o
710 +obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4) += mach-tl-wr741nd-v4.o
711 +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1)  += mach-tl-wr841n.o
712 +obj-$(CONFIG_ATH79_MACH_TL_WR941ND)    += mach-tl-wr941nd.o
713 +obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
714 +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND)   += mach-tl-wr1043nd.o
715 +obj-$(CONFIG_ATH79_MACH_TL_WR2543N)    += mach-tl-wr2543n.o
716 +obj-$(CONFIG_ATH79_MACH_TL_WR703N)     += mach-tl-wr703n.o
717 +obj-$(CONFIG_ATH79_MACH_UBNT)          += mach-ubnt.o
718  obj-$(CONFIG_ATH79_MACH_UBNT_XM)       += mach-ubnt-xm.o
719 +obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N)  += mach-whr-hp-g300n.o
720 +obj-$(CONFIG_ATH79_MACH_WNDR3700)      += mach-wndr3700.o
721 +obj-$(CONFIG_ATH79_MACH_WNR2000)       += mach-wnr2000.o
722 +obj-$(CONFIG_ATH79_MACH_WP543)         += mach-wp543.o
723 +obj-$(CONFIG_ATH79_MACH_WPE72)         += mach-wpe72.o
724 +obj-$(CONFIG_ATH79_MACH_WRT160NL)      += mach-wrt160nl.o
725 +obj-$(CONFIG_ATH79_MACH_WRT400N)       += mach-wrt400n.o
726 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH) += mach-wzr-hp-g300nh.o
727 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2)        += mach-wzr-hp-g300nh2.o
728 +obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H) += mach-wzr-hp-ag300h.o
729 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H)  += mach-wzr-hp-g450h.o
730 --- a/arch/mips/ath79/prom.c
731 +++ b/arch/mips/ath79/prom.c
732 @@ -180,6 +180,9 @@ void __init prom_init(void)
733                         ath79_prom_append_cmdline("board", env);
734                 }
735         }
736 +
737 +       if (strstr(arcs_cmdline, "board=750Gr3"))
738 +               ath79_prom_append_cmdline("console", "ttyS0,115200");
739  }
740  
741  void __init prom_free_prom_memory(void)