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