ar71xx: merge machine support patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 33820
This commit is contained in:
parent
2e1bc1e15b
commit
7a72f01a72
4 changed files with 21 additions and 77 deletions
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
@@ -16,18 +16,98 @@
|
||||
@@ -16,18 +16,101 @@
|
||||
|
||||
enum ath79_mach_type {
|
||||
ATH79_MACH_GENERIC = 0,
|
||||
|
@ -33,6 +33,7 @@
|
|||
+ ATH79_MACH_MZK_W04NU, /* Planex MZK-W04NU */
|
||||
+ ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */
|
||||
+ ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
|
||||
+ ATH79_MACH_OM2P_HS, /* OpenMesh OM2P-HS */
|
||||
+ ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */
|
||||
+ ATH79_MACH_OM2P, /* OpenMesh OM2P */
|
||||
+ ATH79_MACH_PB42, /* Atheros PB42 */
|
||||
|
@ -57,6 +58,7 @@
|
|||
+ ATH79_MACH_TEW_712BR, /* TRENDnet TEW-712BR */
|
||||
+ ATH79_MACH_TL_MR11U, /* TP-LINK TL-MR11U */
|
||||
+ ATH79_MACH_TL_MR3020, /* TP-LINK TL-MR3020 */
|
||||
+ ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */
|
||||
+ ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */
|
||||
+ ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */
|
||||
+ ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */
|
||||
|
@ -70,6 +72,7 @@
|
|||
+ ATH79_MACH_TL_WR741ND_V4, /* TP-LINK TL-WR741ND v4*/
|
||||
+ ATH79_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
|
||||
+ ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */
|
||||
+ ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */
|
||||
+ ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
|
||||
ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */
|
||||
ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
|
||||
|
@ -202,7 +205,7 @@
|
|||
config ATH79_MACH_PB44
|
||||
bool "Atheros PB44 reference board"
|
||||
select SOC_AR71XX
|
||||
@@ -67,6 +147,447 @@ config ATH79_MACH_PB44
|
||||
@@ -67,6 +147,456 @@ config ATH79_MACH_PB44
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Atheros PB44 reference board.
|
||||
|
||||
|
@ -471,7 +474,7 @@
|
|||
+ select ATH79_DEV_M25P80
|
||||
+
|
||||
+config ATH79_MACH_TL_MR11U
|
||||
+ bool "TP-LINK TL-MR11U support"
|
||||
+ bool "TP-LINK TL-MR11U/TL-MR3040 support"
|
||||
+ select SOC_AR933X
|
||||
+ select ATH79_DEV_ETH
|
||||
+ select ATH79_DEV_GPIO_BUTTONS
|
||||
|
@ -566,6 +569,15 @@
|
|||
+ select ATH79_DEV_LEDS_GPIO
|
||||
+ select ATH79_DEV_M25P80
|
||||
+
|
||||
+config ATH79_MACH_TL_WR841N_V8
|
||||
+ bool "TP-LINK TL-WR841N/ND v8 support"
|
||||
+ select SOC_AR934X
|
||||
+ select ATH79_DEV_ETH
|
||||
+ select ATH79_DEV_GPIO_BUTTONS
|
||||
+ select ATH79_DEV_LEDS_GPIO
|
||||
+ select ATH79_DEV_M25P80
|
||||
+ select ATH79_DEV_WMAC
|
||||
+
|
||||
+config ATH79_MACH_TL_WR941ND
|
||||
+ bool "TP-LINK TL-WR941ND support"
|
||||
+ select SOC_AR913X
|
||||
|
@ -650,7 +662,7 @@
|
|||
config ATH79_MACH_UBNT_XM
|
||||
bool "Ubiquiti Networks XM (rev 1.0) board"
|
||||
select SOC_AR724X
|
||||
@@ -80,6 +601,24 @@ config ATH79_MACH_UBNT_XM
|
||||
@@ -80,6 +610,24 @@ config ATH79_MACH_UBNT_XM
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Ubiquiti Networks XM (rev 1.0) board.
|
||||
|
||||
|
@ -675,7 +687,7 @@
|
|||
endmenu
|
||||
|
||||
config SOC_AR71XX
|
||||
@@ -115,10 +654,6 @@ config SOC_QCA955X
|
||||
@@ -115,10 +663,6 @@ config SOC_QCA955X
|
||||
select PCI_AR724X if PCI
|
||||
def_bool n
|
||||
|
||||
|
@ -686,7 +698,7 @@
|
|||
config ATH79_DEV_AP9X_PCI
|
||||
select ATH79_PCI_ATH9K_FIXUP
|
||||
def_bool n
|
||||
@@ -129,7 +664,14 @@ config ATH79_DEV_DSA
|
||||
@@ -129,7 +673,14 @@ config ATH79_DEV_DSA
|
||||
config ATH79_DEV_ETH
|
||||
def_bool n
|
||||
|
||||
|
@ -702,7 +714,7 @@
|
|||
def_bool n
|
||||
|
||||
config ATH79_DEV_GPIO_BUTTONS
|
||||
@@ -161,4 +703,7 @@ config ATH79_PCI_ATH9K_FIXUP
|
||||
@@ -161,4 +712,7 @@ config ATH79_PCI_ATH9K_FIXUP
|
||||
config ATH79_ROUTERBOOT
|
||||
def_bool n
|
||||
|
||||
|
@ -712,7 +724,7 @@
|
|||
endif
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
@@ -38,9 +38,65 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
|
||||
@@ -38,9 +38,66 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
|
||||
#
|
||||
# Machines
|
||||
#
|
||||
|
@ -759,6 +771,7 @@
|
|||
+obj-$(CONFIG_ATH79_MACH_TL_WR741ND) += mach-tl-wr741nd.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4) += mach-tl-wr741nd-v4.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1) += mach-tl-wr841n.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8) += mach-tl-wr841n-v8.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
--- a/arch/mips/ath79/Kconfig
|
||||
+++ b/arch/mips/ath79/Kconfig
|
||||
@@ -412,7 +412,7 @@ config ATH79_MACH_EAP7660D
|
||||
select ATH79_DEV_M25P80
|
||||
|
||||
config ATH79_MACH_TL_MR11U
|
||||
- bool "TP-LINK TL-MR11U support"
|
||||
+ bool "TP-LINK TL-MR11U/TL-MR3040 support"
|
||||
select SOC_AR933X
|
||||
select ATH79_DEV_ETH
|
||||
select ATH79_DEV_GPIO_BUTTONS
|
||||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
@@ -69,6 +69,7 @@ enum ath79_mach_type {
|
||||
ATH79_MACH_TEW_712BR, /* TRENDnet TEW-712BR */
|
||||
ATH79_MACH_TL_MR11U, /* TP-LINK TL-MR11U */
|
||||
ATH79_MACH_TL_MR3020, /* TP-LINK TL-MR3020 */
|
||||
+ ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */
|
||||
ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */
|
||||
ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */
|
||||
ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */
|
|
@ -1,38 +0,0 @@
|
|||
--- a/arch/mips/ath79/Kconfig
|
||||
+++ b/arch/mips/ath79/Kconfig
|
||||
@@ -507,6 +507,15 @@ config ATH79_MACH_TL_WR841N_V1
|
||||
select ATH79_DEV_LEDS_GPIO
|
||||
select ATH79_DEV_M25P80
|
||||
|
||||
+config ATH79_MACH_TL_WR841N_V8
|
||||
+ bool "TP-LINK TL-WR841N/ND v8 support"
|
||||
+ select SOC_AR934X
|
||||
+ select ATH79_DEV_ETH
|
||||
+ select ATH79_DEV_GPIO_BUTTONS
|
||||
+ select ATH79_DEV_LEDS_GPIO
|
||||
+ select ATH79_DEV_M25P80
|
||||
+ select ATH79_DEV_WMAC
|
||||
+
|
||||
config ATH79_MACH_TL_WR941ND
|
||||
bool "TP-LINK TL-WR941ND support"
|
||||
select SOC_AR913X
|
||||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
@@ -83,6 +83,7 @@ enum ath79_mach_type {
|
||||
ATH79_MACH_TL_WR741ND_V4, /* TP-LINK TL-WR741ND v4*/
|
||||
ATH79_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
|
||||
ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */
|
||||
+ ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */
|
||||
ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
|
||||
ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */
|
||||
ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
@@ -81,6 +81,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WDR4300)
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR741ND) += mach-tl-wr741nd.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4) += mach-tl-wr741nd-v4.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1) += mach-tl-wr841n.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8) += mach-tl-wr841n-v8.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
|
||||
obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
|
|
@ -1,10 +0,0 @@
|
|||
--- a/arch/mips/ath79/machtypes.h 2012-10-12 21:42:29.000000000 +0800
|
||||
+++ b/arch/mips/ath79/machtypes.h 2012-10-12 21:43:28.000000000 +0800
|
||||
@@ -45,6 +45,7 @@
|
||||
ATH79_MACH_MZK_W04NU, /* Planex MZK-W04NU */
|
||||
ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */
|
||||
ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */
|
||||
+ ATH79_MACH_OM2P_HS, /* OpenMesh OM2P-HS */
|
||||
ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */
|
||||
ATH79_MACH_OM2P, /* OpenMesh OM2P */
|
||||
ATH79_MACH_PB42, /* Atheros PB42 */
|
Loading…
Reference in a new issue