[OpenWrt-Devel] [PATCH] ar71xx: Add support for MERCURY MAC1200R

2015-02-08 Thread Roger Pueyo Centelles 
This patch adds support for MERCURY MAC1200R, a dual band 802.11bgn + 802.11ac
router based on the AR9344, with QCA988x ath10k radio and 5 Fast Ethernet ports

Signed-off-by: Roger Pueyo Centelles roger.pu...@guifi.net
---
 target/linux/ar71xx/base-files/etc/diag.sh |   3 +
 .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
 .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
 .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
 target/linux/ar71xx/config-3.14|   1 +
 .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 155 +
 target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
 target/linux/ar71xx/image/Makefile |   1 +
 .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 ++
 10 files changed, 229 insertions(+)
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
 create mode 100644 
target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 03ca864..47d99fa 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -105,6 +105,9 @@ get_status_led() {
ls-sr71)
status_led=ubnt:green:d22
;;
+   mc-mac1200r)
+   status_led=mercury:green:system
+   ;;
mr600)
status_led=mr600:orange:power
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 61d0314..69e8daa 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -171,6 +171,11 @@ hornet-ub)
ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
;;
 
+mc-mac1200r)
+   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g phy1tpt
+   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g phy0tpt
+   ;;
+
 mr600)
ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58 phy0tpt
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 144fd28..706cb7f 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -367,6 +367,7 @@ dir-615-e1 |\
 dir-615-e4 |\
 hiwifi-hc6361 |\
 ja76pf |\
+mc-mac1200r|\
 mynet-n600 |\
 oolite |\
 qihoo-c301 |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b5224ae..99e4467 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -97,6 +97,9 @@ tplink_board_detect() {
015300*)
model=EasyLink EL-MINI
;;
+   12*)
+   model=MERCURY MAC1200R
+   ;;
3C0001*)
model=OOLITE
;;
@@ -435,6 +438,9 @@ ar71xx_board_detect() {
*LS-SR71)
name=ls-sr71
;;
+   *MAC1200R)
+   name=mc-mac1200r
+   ;;
*MR600v2)
name=mr600v2
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 576ce56..d2a7d8e 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -297,6 +297,7 @@ platform_check_image() {
el-m150 | \
el-mini | \
gl-inet | \
+   mc-mac1200r | \
oolite | \
smart-300 | \
tl-mr10u | \
diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
index 82b2d13..b78d4d2 100644
--- a/target/linux/ar71xx/config-3.14
+++ b/target/linux/ar71xx/config-3.14
@@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
 CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
+CONFIG_ATH79_MACH_MC_MAC1200R=y
 CONFIG_ATH79_MACH_MR600=y
 CONFIG_ATH79_MACH_MR900=y
 CONFIG_ATH79_MACH_MYNET_N600=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
new file mode 100644
index 000..70051cf
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
@@ -0,0 +1,155 @@
+/*
+ *  MERCURY MAC1200R board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos juh...@openwrt.org
+ *  Copyright (C) 2013 Gui Iribarren g...@altermundi.net
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software

[OpenWrt-Devel] [PATCH] ar71xx: Add support for MERCURY MAC1200R

2015-02-08 Thread roger . pueyo 
From: Roger Pueyo Centelles roger.pu...@guifi.net

This patch adds support for MERCURY MAC1200R, a dual band 802.11bgn + 802.11ac
router based on the AR9344, with QCA988x ath10k radio and 5 Fast Ethernet ports

Signed-off-by: Roger Pueyo Centelles roger.pu...@guifi.net
---
 target/linux/ar71xx/base-files/etc/diag.sh |   3 +
 .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
 .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
 .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
 target/linux/ar71xx/config-3.14|   1 +
 .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 155 +
 target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
 target/linux/ar71xx/image/Makefile |   1 +
 .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 ++
 10 files changed, 229 insertions(+)
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
 create mode 100644 
target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 03ca864..47d99fa 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -105,6 +105,9 @@ get_status_led() {
ls-sr71)
status_led=ubnt:green:d22
;;
+   mc-mac1200r)
+   status_led=mercury:green:system
+   ;;
mr600)
status_led=mr600:orange:power
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 61d0314..4d7a4a3 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -171,6 +171,11 @@ hornet-ub)
ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
;;
 
+mc-mac1200r)
+   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g phy1tpt
+   ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g wlan0
+   ;;
+
 mr600)
ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58 phy0tpt
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 144fd28..706cb7f 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -367,6 +367,7 @@ dir-615-e1 |\
 dir-615-e4 |\
 hiwifi-hc6361 |\
 ja76pf |\
+mc-mac1200r|\
 mynet-n600 |\
 oolite |\
 qihoo-c301 |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b5224ae..99e4467 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -97,6 +97,9 @@ tplink_board_detect() {
015300*)
model=EasyLink EL-MINI
;;
+   12*)
+   model=MERCURY MAC1200R
+   ;;
3C0001*)
model=OOLITE
;;
@@ -435,6 +438,9 @@ ar71xx_board_detect() {
*LS-SR71)
name=ls-sr71
;;
+   *MAC1200R)
+   name=mc-mac1200r
+   ;;
*MR600v2)
name=mr600v2
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 576ce56..d2a7d8e 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -297,6 +297,7 @@ platform_check_image() {
el-m150 | \
el-mini | \
gl-inet | \
+   mc-mac1200r | \
oolite | \
smart-300 | \
tl-mr10u | \
diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
index 82b2d13..b78d4d2 100644
--- a/target/linux/ar71xx/config-3.14
+++ b/target/linux/ar71xx/config-3.14
@@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
 CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
+CONFIG_ATH79_MACH_MC_MAC1200R=y
 CONFIG_ATH79_MACH_MR600=y
 CONFIG_ATH79_MACH_MR900=y
 CONFIG_ATH79_MACH_MYNET_N600=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
new file mode 100644
index 000..70051cf
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
@@ -0,0 +1,155 @@
+/*
+ *  MERCURY MAC1200R board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos juh...@openwrt.org
+ *  Copyright (C) 2013 Gui Iribarren g...@altermundi.net
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License

Re: [OpenWrt-Devel] [PATCH] ar71xx: Add support for MERCURY MAC1200R

2015-02-08 Thread 郭传鈜 
Ah…Someone added an LED trigger for ath10k serveral days ago…So phy0tpt is
able to use now:D
2015年2月8日 下午10:25于 roger.pu...@guifi.net写道：

 From: Roger Pueyo Centelles roger.pu...@guifi.net

 This patch adds support for MERCURY MAC1200R, a dual band 802.11bgn +
 802.11ac
 router based on the AR9344, with QCA988x ath10k radio and 5 Fast Ethernet
 ports

 Signed-off-by: Roger Pueyo Centelles roger.pu...@guifi.net
 ---
  target/linux/ar71xx/base-files/etc/diag.sh |   3 +
  .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
  .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
  target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
  .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
  target/linux/ar71xx/config-3.14|   1 +
  .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 155
 +
  target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
  target/linux/ar71xx/image/Makefile |   1 +
  .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 ++
  10 files changed, 229 insertions(+)
  create mode 100644
 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
  create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
  create mode 100644
 target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

 diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
 b/target/linux/ar71xx/base-files/etc/diag.sh
 index 03ca864..47d99fa 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
 @@ -105,6 +105,9 @@ get_status_led() {
 ls-sr71)
 status_led=ubnt:green:d22
 ;;
 +   mc-mac1200r)
 +   status_led=mercury:green:system
 +   ;;
 mr600)
 status_led=mr600:orange:power
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 index 61d0314..4d7a4a3 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 @@ -171,6 +171,11 @@ hornet-ub)
 ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
 ;;

 +mc-mac1200r)
 +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g
 phy1tpt
 +   ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g
 wlan0
 +   ;;
 +
  mr600)
 ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58
 phy0tpt
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 index 144fd28..706cb7f 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 @@ -367,6 +367,7 @@ dir-615-e1 |\
  dir-615-e4 |\
  hiwifi-hc6361 |\
  ja76pf |\
 +mc-mac1200r|\
  mynet-n600 |\
  oolite |\
  qihoo-c301 |\
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 index b5224ae..99e4467 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 @@ -97,6 +97,9 @@ tplink_board_detect() {
 015300*)
 model=EasyLink EL-MINI
 ;;
 +   12*)
 +   model=MERCURY MAC1200R
 +   ;;
 3C0001*)
 model=OOLITE
 ;;
 @@ -435,6 +438,9 @@ ar71xx_board_detect() {
 *LS-SR71)
 name=ls-sr71
 ;;
 +   *MAC1200R)
 +   name=mc-mac1200r
 +   ;;
 *MR600v2)
 name=mr600v2
 ;;
 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 index 576ce56..d2a7d8e 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 @@ -297,6 +297,7 @@ platform_check_image() {
 el-m150 | \
 el-mini | \
 gl-inet | \
 +   mc-mac1200r | \
 oolite | \
 smart-300 | \
 tl-mr10u | \
 diff --git a/target/linux/ar71xx/config-3.14
 b/target/linux/ar71xx/config-3.14
 index 82b2d13..b78d4d2 100644
 --- a/target/linux/ar71xx/config-3.14
 +++ b/target/linux/ar71xx/config-3.14
 @@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
  CONFIG_ATH79_MACH_HORNET_UB=y
  CONFIG_ATH79_MACH_JA76PF=y
  CONFIG_ATH79_MACH_JWAP003=y
 +CONFIG_ATH79_MACH_MC_MAC1200R=y
  CONFIG_ATH79_MACH_MR600=y
  CONFIG_ATH79_MACH_MR900=y
  CONFIG_ATH79_MACH_MYNET_N600=y
 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 new file mode 100644
 index 000..70051cf
 --- /dev/null
 +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 @@ -0,0 +1,155 @@
 +/*
 + *  MERCURY MAC1200R board

Re: [OpenWrt-Devel] [PATCH] ar71xx: Add support for MERCURY MAC1200R

2015-02-08 Thread Roger Pueyo Centelles 
Fine. Resending... :)

2015-02-08 16:21 GMT+01:00 郭传鈜 gch981...@gmail.com:

 Ah…Someone added an LED trigger for ath10k serveral days ago…So phy0tpt is
 able to use now:D
 2015年2月8日 下午10:25于 roger.pu...@guifi.net写道：

 From: Roger Pueyo Centelles roger.pu...@guifi.net

 This patch adds support for MERCURY MAC1200R, a dual band 802.11bgn +
 802.11ac
 router based on the AR9344, with QCA988x ath10k radio and 5 Fast Ethernet
 ports

 Signed-off-by: Roger Pueyo Centelles roger.pu...@guifi.net
 ---
  target/linux/ar71xx/base-files/etc/diag.sh |   3 +
  .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
  .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
  target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
  .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
  target/linux/ar71xx/config-3.14|   1 +
  .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 155
 +
  target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
  target/linux/ar71xx/image/Makefile |   1 +
  .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 ++
  10 files changed, 229 insertions(+)
  create mode 100644
 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
  create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
  create mode 100644
 target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

 diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
 b/target/linux/ar71xx/base-files/etc/diag.sh
 index 03ca864..47d99fa 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
 @@ -105,6 +105,9 @@ get_status_led() {
 ls-sr71)
 status_led=ubnt:green:d22
 ;;
 +   mc-mac1200r)
 +   status_led=mercury:green:system
 +   ;;
 mr600)
 status_led=mr600:orange:power
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 index 61d0314..4d7a4a3 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 @@ -171,6 +171,11 @@ hornet-ub)
 ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
 ;;

 +mc-mac1200r)
 +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g
 phy1tpt
 +   ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g
 wlan0
 +   ;;
 +
  mr600)
 ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58
 phy0tpt
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 index 144fd28..706cb7f 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 @@ -367,6 +367,7 @@ dir-615-e1 |\
  dir-615-e4 |\
  hiwifi-hc6361 |\
  ja76pf |\
 +mc-mac1200r|\
  mynet-n600 |\
  oolite |\
  qihoo-c301 |\
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 index b5224ae..99e4467 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 @@ -97,6 +97,9 @@ tplink_board_detect() {
 015300*)
 model=EasyLink EL-MINI
 ;;
 +   12*)
 +   model=MERCURY MAC1200R
 +   ;;
 3C0001*)
 model=OOLITE
 ;;
 @@ -435,6 +438,9 @@ ar71xx_board_detect() {
 *LS-SR71)
 name=ls-sr71
 ;;
 +   *MAC1200R)
 +   name=mc-mac1200r
 +   ;;
 *MR600v2)
 name=mr600v2
 ;;
 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 index 576ce56..d2a7d8e 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 @@ -297,6 +297,7 @@ platform_check_image() {
 el-m150 | \
 el-mini | \
 gl-inet | \
 +   mc-mac1200r | \
 oolite | \
 smart-300 | \
 tl-mr10u | \
 diff --git a/target/linux/ar71xx/config-3.14
 b/target/linux/ar71xx/config-3.14
 index 82b2d13..b78d4d2 100644
 --- a/target/linux/ar71xx/config-3.14
 +++ b/target/linux/ar71xx/config-3.14
 @@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
  CONFIG_ATH79_MACH_HORNET_UB=y
  CONFIG_ATH79_MACH_JA76PF=y
  CONFIG_ATH79_MACH_JWAP003=y
 +CONFIG_ATH79_MACH_MC_MAC1200R=y
  CONFIG_ATH79_MACH_MR600=y
  CONFIG_ATH79_MACH_MR900=y
  CONFIG_ATH79_MACH_MYNET_N600=y
 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 new file mode 100644
 index 000..70051cf
 --- /dev/null
 +++

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-27 Thread Roger Pueyo Centelles 
Hi,

@Hartmut
Ok, now I see. Thanks!

@郭传鈜

Acoording to mach-archer-c7.c ,I think we should use ath79_register_pci();
 here and use /lib/preinit/81_load_ath10k_board_bin to load calibration
 data for ath10k.


So, I understand I have to remove this line from
target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c

ap91_pci_init(art + MAC1200R_PCIE_CALDATA_OFFSET, tmpmac);

Then, the MACs in my router end in:
- eth0=47
- eth1=49
- wlan1=4A

so it makes sense to have wlan0 ending in 48 (i.e. eth1 minus 1). In
target/linux/ar71xx/base-files/lib/preinit/81_load_ath10k_board_bin (art
partition is mtd4):

dd if=/dev/mtdblock4 \
bs=1 skip=20492 count=2104 
/tmp/ath10k-board.bin
;;
mc-mac1200r)
local mac
mac=$(macaddr_add $(cat
/sys/class/net/eth1/address) -1)

dd if=/dev/mtdblock4 \
bs=1 skip=20480 count=6 \
of=/tmp/ath10k-board.bin
macaddr_2bin $mac  /tmp/ath10k-board.bin
dd if=/dev/mtdblock4 \
bs=1 skip=20492 count=2104 
/tmp/ath10k-board.bin
;;
r6100)
local mac
mac=$(macaddr_add $(cat
/sys/class/net/eth1/address) +2)

dd if=/dev/mtdblock2 \

 +$(eval $(call
 SingleProfile,TPLINK-LZMA,64kraw,MAC1200R,mc-mac1200r,MC-MAC1200R,ttyS0,115200,0x1201,1,8Mlzma))
 The factory image is broken since TP-LINK started to use a new firmware
 format with RSA signature in China.This should be introduced in the TOH
 wiki I think:)


Besides adding this to the wiki, what should I change so that the factory
firmware is not generated?

Thanks!

Roger
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-26 Thread Roger Pueyo Centelles 
Hi,

Thank you both for your comments.

@郭传鈜:

 +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g
phy1tpt
 I think the following line is incorrect:
 +   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g
phy0tpt
 There is no LED trigger called 'phy0tpt' so I think we should use netdev
trigger like this:
 ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g wlan0

Ok!


 +static struct gpio_keys_button mac1200r_gpio_keys[] __initdata = {
 +   {
 +   .desc   = WPS button,
 +   .type   = EV_KEY,
 +   .code   = KEY_WPS_BUTTON,
 +   .debounce_interval = MAC1200R_KEYS_DEBOUNCE_INTERVAL,
 +   .gpio   = MAC1200R_GPIO_BTN_WPS,
 +   .active_low = 1,
 +   },
 +};
 Although the key is called WPS/RESET , I think a reset button is more
important than a WPS button.That's just my personal opinion :)

I think you are right.


 +   ap91_pci_init(art + MAC1200R_PCIE_CALDATA_OFFSET, tmpmac);
 What? I think this function is only able to load CALDATA for ath9k
devices.Maybe I'm wrong:)

The router has two radios, one ath9k and one ath10k. Isn't it needed for
the ath9k calibration data? Or this radio is already covered by
ath79_register_wmac(art + MAC1200R_WMAC_CALDATA_OFFSET, tmpmac); ...?


 +$(eval $(call
SingleProfile,TPLINK-LZMA,64kraw,MAC1200R,mc-mac1200r,MC-MAC1200R,ttyS0,115200,0x1201,1,8Mlzma))
The factory image is broken since TP-LINK started to use a new firmware
format with RSA signature in China.This should be introduced in the TOH
wiki I think:)

Done!



@John:

Sorry. Do you mean a description for the patch? I am not aware of what SoB
means.


Thanks!

Roger
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-26 Thread 郭传鈜 
2015-01-27 1:10 GMT+08:00 Roger Pueyo Centelles rogerpu...@rogerpueyo.com:

 Hi,

 Thank you both for your comments.

 @郭传鈜:

  +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g
 phy1tpt
  I think the following line is incorrect:
  +   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g
 phy0tpt
  There is no LED trigger called 'phy0tpt' so I think we should use netdev
 trigger like this:
  ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g wlan0

 Ok!


  +static struct gpio_keys_button mac1200r_gpio_keys[] __initdata = {
  +   {
  +   .desc   = WPS button,
  +   .type   = EV_KEY,
  +   .code   = KEY_WPS_BUTTON,
  +   .debounce_interval = MAC1200R_KEYS_DEBOUNCE_INTERVAL,
  +   .gpio   = MAC1200R_GPIO_BTN_WPS,
  +   .active_low = 1,
  +   },
  +};
  Although the key is called WPS/RESET , I think a reset button is more
 important than a WPS button.That's just my personal opinion :)

 I think you are right.


  +   ap91_pci_init(art + MAC1200R_PCIE_CALDATA_OFFSET, tmpmac);
  What? I think this function is only able to load CALDATA for ath9k
 devices.Maybe I'm wrong:)

 The router has two radios, one ath9k and one ath10k. Isn't it needed for
 the ath9k calibration data? Or this radio is already covered by
 ath79_register_wmac(art + MAC1200R_WMAC_CALDATA_OFFSET, tmpmac); ...?

 Acoording to mach-archer-c7.c ,I think we should use ath79_register_pci();
here and use /lib/preinit/81_load_ath10k_board_bin to load calibration data
for ath10k.


  +$(eval $(call
 SingleProfile,TPLINK-LZMA,64kraw,MAC1200R,mc-mac1200r,MC-MAC1200R,ttyS0,115200,0x1201,1,8Mlzma))
 The factory image is broken since TP-LINK started to use a new firmware
 format with RSA signature in China.This should be introduced in the TOH
 wiki I think:)

 Done!



 @John:

 Sorry. Do you mean a description for the patch? I am not aware of what SoB
 means.


 Thanks!

 Roger

 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-26 Thread Hartmut Knaack 
Roger Pueyo Centelles schrieb am 26.01.2015 um 18:10:
 Hi,
 
 Thank you both for your comments.
 
 @郭传鈜:
 
 +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g 
 phy1tpt
 I think the following line is incorrect:
 +   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g 
 phy0tpt
 There is no LED trigger called 'phy0tpt' so I think we should use netdev 
 trigger like this:
 ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g wlan0
 
 Ok!
 
 
 +static struct gpio_keys_button mac1200r_gpio_keys[] __initdata = {
 +   {
 +   .desc   = WPS button,
 +   .type   = EV_KEY,
 +   .code   = KEY_WPS_BUTTON,
 +   .debounce_interval = MAC1200R_KEYS_DEBOUNCE_INTERVAL,
 +   .gpio   = MAC1200R_GPIO_BTN_WPS,
 +   .active_low = 1,
 +   },
 +};
 Although the key is called WPS/RESET , I think a reset button is more 
 important than a WPS button.That's just my personal opinion :)
 
 I think you are right.
 
 
 +   ap91_pci_init(art + MAC1200R_PCIE_CALDATA_OFFSET, tmpmac);
 What? I think this function is only able to load CALDATA for ath9k 
 devices.Maybe I'm wrong:)
 
 The router has two radios, one ath9k and one ath10k. Isn't it needed for the 
 ath9k calibration data? Or this radio is already covered by 
 ath79_register_wmac(art + MAC1200R_WMAC_CALDATA_OFFSET, tmpmac); ...?
 
 
 +$(eval $(call 
 SingleProfile,TPLINK-LZMA,64kraw,MAC1200R,mc-mac1200r,MC-MAC1200R,ttyS0,115200,0x1201,1,8Mlzma))
The factory image is broken since TP-LINK started to use a new firmware 
format with RSA signature in China.This should be introduced in the TOH wiki 
I think:)
 
 Done!
 
 
 
 @John:
 
 Sorry. Do you mean a description for the patch? I am not aware of what SoB 
 means.

Yes, a patch description followed by your Signed-off-by (SoB) is missing. Have 
a look at the submitting patches wiki page for the patch format requirements. 
Also, check through your patch again and make sure to mind alphabetic order 
wherever needed.

 
 
 Thanks!
 
 Roger
 
 
 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-16 Thread John Crispin 


On 11/01/2015 12:48, open...@rogerpueyo.com wrote:
 From: Roger Pueyo Centelles roger.pu...@guifi.net
 

description and SoB are missing




 ---
  target/linux/ar71xx/base-files/etc/diag.sh |   3 +
  .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
  .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
  target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
  .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
  target/linux/ar71xx/config-3.14|   1 +
  .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 157 
 +
  target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
  target/linux/ar71xx/image/Makefile |   1 +
  .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 +
  10 files changed, 231 insertions(+)
  create mode 100644 
 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
  create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
  create mode 100644 
 target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch
 
 diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
 b/target/linux/ar71xx/base-files/etc/diag.sh
 index 06b96a3..388727f 100755
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
 @@ -105,6 +105,9 @@ get_status_led() {
   ls-sr71)
   status_led=ubnt:green:d22
   ;;
 + mc-mac1200r)
 + status_led=mercury:green:system
 + ;;
   mr600)
   status_led=mr600:orange:power
   ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
 b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 index 296ea57..dc5dfa1 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 @@ -166,6 +166,11 @@ hornet-ub)
   ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
   ;;
  
 +mc-mac1200r)
 + ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g phy1tpt
 + ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g phy0tpt
 + ;;
 +
  mr600)
   ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58 phy0tpt
   ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
 b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 index b4b6cb3..8151470 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 @@ -367,6 +367,7 @@ dir-615-e1 |\
  dir-615-e4 |\
  hiwifi-hc6361 |\
  ja76pf |\
 +mc-mac1200r|\
  mynet-n600 |\
  oolite |\
  qihoo-c301 |\
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
 b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 index 9b056e9..3ce63aa 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 @@ -97,6 +97,9 @@ tplink_board_detect() {
   015300*)
   model=EasyLink EL-MINI
   ;;
 + 12*)
 + model=MERCURY MAC1200R
 + ;;
   3C0001*)
   model=OOLITE
   ;;
 @@ -432,6 +435,9 @@ ar71xx_board_detect() {
   *LS-SR71)
   name=ls-sr71
   ;;
 + *MAC1200R)
 + name=mc-mac1200r
 + ;;
   *MR600v2)
   name=mr600v2
   ;;
 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
 b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 index 6dabf4e..7153614 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 @@ -297,6 +297,7 @@ platform_check_image() {
   el-m150 | \
   el-mini | \
   gl-inet | \
 + mc-mac1200r | \
   oolite | \
   smart-300 | \
   tl-mr10u | \
 diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
 index b6fa4ab..a99c082 100644
 --- a/target/linux/ar71xx/config-3.14
 +++ b/target/linux/ar71xx/config-3.14
 @@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
  CONFIG_ATH79_MACH_HORNET_UB=y
  CONFIG_ATH79_MACH_JA76PF=y
  CONFIG_ATH79_MACH_JWAP003=y
 +CONFIG_ATH79_MACH_MC_MAC1200R=y
  CONFIG_ATH79_MACH_MR600=y
  CONFIG_ATH79_MACH_MR900=y
  CONFIG_ATH79_MACH_MYNET_N600=y
 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c 
 b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 new file mode 100644
 index 000..6b92b9c
 --- /dev/null
 +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 @@ -0,0 +1,157 @@
 +/*
 + *  MERCURY MAC1200R board support
 + *
 + *  Copyright (C) 2012 Gabor Juhos juh...@openwrt.org
 + *  Copyright (C) 2013 Gui Iribarren g...@altermundi.net
 + *
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
 + *  by the Free Software Foundation.
 + */
 +

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-14 Thread 郭传鈜 
2015-01-11 19:48 GMT+08:00  open...@rogerpueyo.com:
 From: Roger Pueyo Centelles roger.pu...@guifi.net

 ---
  target/linux/ar71xx/base-files/etc/diag.sh |   3 +
  .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
  .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
  target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
  .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
  target/linux/ar71xx/config-3.14|   1 +
  .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 157
+
  target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
  target/linux/ar71xx/image/Makefile |   1 +
  .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 +
  10 files changed, 231 insertions(+)
  create mode 100644
target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
  create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
  create mode 100644
target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

 diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
 index 06b96a3..388727f 100755
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
 @@ -105,6 +105,9 @@ get_status_led() {
 ls-sr71)
 status_led=ubnt:green:d22
 ;;
 +   mc-mac1200r)
 +   status_led=mercury:green:system
 +   ;;
 mr600)
 status_led=mr600:orange:power
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 index 296ea57..dc5dfa1 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 @@ -166,6 +166,11 @@ hornet-ub)
 ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
 ;;

 +mc-mac1200r)
 +   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g
phy1tpt

I think the following line is incorrect:
 +   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g
phy0tpt
There is no LED trigger called 'phy0tpt' so I think we should use netdev
trigger like this:
ucidef_set_led_netdev wlan5g WLAN5G mercury:green:wlan5g wlan0


 +   ;;
 +
  mr600)
 ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58
phy0tpt
 ;;
 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 index b4b6cb3..8151470 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 @@ -367,6 +367,7 @@ dir-615-e1 |\
  dir-615-e4 |\
  hiwifi-hc6361 |\
  ja76pf |\
 +mc-mac1200r|\
  mynet-n600 |\
  oolite |\
  qihoo-c301 |\
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 index 9b056e9..3ce63aa 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 @@ -97,6 +97,9 @@ tplink_board_detect() {
 015300*)
 model=EasyLink EL-MINI
 ;;
 +   12*)
 +   model=MERCURY MAC1200R
 +   ;;
 3C0001*)
 model=OOLITE
 ;;
 @@ -432,6 +435,9 @@ ar71xx_board_detect() {
 *LS-SR71)
 name=ls-sr71
 ;;
 +   *MAC1200R)
 +   name=mc-mac1200r
 +   ;;
 *MR600v2)
 name=mr600v2
 ;;
 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 index 6dabf4e..7153614 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 @@ -297,6 +297,7 @@ platform_check_image() {
 el-m150 | \
 el-mini | \
 gl-inet | \
 +   mc-mac1200r | \
 oolite | \
 smart-300 | \
 tl-mr10u | \
 diff --git a/target/linux/ar71xx/config-3.14
b/target/linux/ar71xx/config-3.14
 index b6fa4ab..a99c082 100644
 --- a/target/linux/ar71xx/config-3.14
 +++ b/target/linux/ar71xx/config-3.14
 @@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
  CONFIG_ATH79_MACH_HORNET_UB=y
  CONFIG_ATH79_MACH_JA76PF=y
  CONFIG_ATH79_MACH_JWAP003=y
 +CONFIG_ATH79_MACH_MC_MAC1200R=y
  CONFIG_ATH79_MACH_MR600=y
  CONFIG_ATH79_MACH_MR900=y
  CONFIG_ATH79_MACH_MYNET_N600=y
 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 new file mode 100644
 index 000..6b92b9c
 --- /dev/null
 +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 @@ -0,0 +1,157 @@
 +/*
 + *  MERCURY MAC1200R board support
 + *
 + *  Copyright (C) 2012 Gabor Juhos juh...@openwrt.org
 + *  Copyright (C) 2013 Gui Iribarren

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-12 Thread Roger Pueyo Centelles 
Hi,

Please check http://wiki.openwrt.org/toh/mercury/mac1200r

Regards,

Roger

2015-01-12 0:21 GMT+01:00 Bruno Randolf b...@einfach.org:

 On 01/11/2015 09:25 PM, Gioacchino Mazzurco wrote:
  The device has two radios:
   - 802.11abgn AR9344 SoC, ath9k, working OK
   - 802.11ac QCA988x, ath10k, working in AP and STA modes

 Interesting device. Can you post more specs, or add to the TOH wiki?

 Thanks,
 bruno


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-11 Thread openwrt 
From: Roger Pueyo Centelles roger.pu...@guifi.net

---
 target/linux/ar71xx/base-files/etc/diag.sh |   3 +
 .../ar71xx/base-files/etc/uci-defaults/01_leds |   5 +
 .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   6 +
 .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
 target/linux/ar71xx/config-3.14|   1 +
 .../files/arch/mips/ath79/mach-mc-mac1200r.c   | 157 +
 target/linux/ar71xx/generic/profiles/mercury.mk|  17 +++
 target/linux/ar71xx/image/Makefile |   1 +
 .../736-MIPS-ath79-add-MC-MAC1200R-support.patch   |  39 +
 10 files changed, 231 insertions(+)
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
 create mode 100644 target/linux/ar71xx/generic/profiles/mercury.mk
 create mode 100644 
target/linux/ar71xx/patches-3.14/736-MIPS-ath79-add-MC-MAC1200R-support.patch

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 06b96a3..388727f 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -105,6 +105,9 @@ get_status_led() {
ls-sr71)
status_led=ubnt:green:d22
;;
+   mc-mac1200r)
+   status_led=mercury:green:system
+   ;;
mr600)
status_led=mr600:orange:power
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 296ea57..dc5dfa1 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -166,6 +166,11 @@ hornet-ub)
ucidef_set_led_usbdev usb USB alfa:blue:usb 1-1
;;
 
+mc-mac1200r)
+   ucidef_set_led_wlan wlan2g WLAN2G mercury:green:wlan2g phy1tpt
+   ucidef_set_led_wlan wlan5g WLAN5G mercury:green:wlan5g phy0tpt
+   ;;
+
 mr600)
ucidef_set_led_wlan wlan58 WLAN58 mr600:green:wlan58 phy0tpt
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index b4b6cb3..8151470 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -367,6 +367,7 @@ dir-615-e1 |\
 dir-615-e4 |\
 hiwifi-hc6361 |\
 ja76pf |\
+mc-mac1200r|\
 mynet-n600 |\
 oolite |\
 qihoo-c301 |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 9b056e9..3ce63aa 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -97,6 +97,9 @@ tplink_board_detect() {
015300*)
model=EasyLink EL-MINI
;;
+   12*)
+   model=MERCURY MAC1200R
+   ;;
3C0001*)
model=OOLITE
;;
@@ -432,6 +435,9 @@ ar71xx_board_detect() {
*LS-SR71)
name=ls-sr71
;;
+   *MAC1200R)
+   name=mc-mac1200r
+   ;;
*MR600v2)
name=mr600v2
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 6dabf4e..7153614 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -297,6 +297,7 @@ platform_check_image() {
el-m150 | \
el-mini | \
gl-inet | \
+   mc-mac1200r | \
oolite | \
smart-300 | \
tl-mr10u | \
diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
index b6fa4ab..a99c082 100644
--- a/target/linux/ar71xx/config-3.14
+++ b/target/linux/ar71xx/config-3.14
@@ -64,6 +64,7 @@ CONFIG_ATH79_MACH_HIWIFI_HC6361=y
 CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
+CONFIG_ATH79_MACH_MC_MAC1200R=y
 CONFIG_ATH79_MACH_MR600=y
 CONFIG_ATH79_MACH_MR900=y
 CONFIG_ATH79_MACH_MYNET_N600=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
new file mode 100644
index 000..6b92b9c
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mc-mac1200r.c
@@ -0,0 +1,157 @@
+/*
+ *  MERCURY MAC1200R board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos juh...@openwrt.org
+ *  Copyright (C) 2013 Gui Iribarren g...@altermundi.net
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include linux/pci.h
+#include linux/phy.h
+#include linux/gpio.h
+#include linux/platform_device.h
+#include linux/ath9k_platform.h
+#include

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-11 Thread Gioacchino Mazzurco 
Does openwrt supports 802.11ac with this router?
Seller claim 802.11ac wireless + 1200Mbit ethernet speed (Gigabit?)

Thanks!
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-11 Thread Roger Pueyo Centelles 
No adhoc nor 802.11s with the current ath10k firmware. Actually, that's
what I want it for. It's a pity the driver is not fully open source.

I've tried with firmware 999.999.0.x (
http://wireless.kernel.org/en/users/Drivers/ath10k/firmware) but it the
wireless interface is not operational and I get a bunch of kernel errors.

I agree, it doesn't make much sense to put a 10/100 switch, but it must be
cheaper than a Gb one.

Cheers,

2015-01-11 22:25 GMT+01:00 Gioacchino Mazzurco g...@eigenlab.org:

 On Sunday, January 11, 2015 09:30:34 PM Roger Pueyo Centelles wrote:
  Apparently it does :)

 Cool!


  The device has two radios:
   - 802.11abgn AR9344 SoC, ath9k, working OK
   - 802.11ac QCA988x, ath10k, working in AP and STA modes

 Doesn't support adhoc nor 802.11s with the 802.11ac :( , does it?


  Ethernet ports are 10/100 :(

 It make no sense :(
 Why did they do such a stupid design?
 Moreover they advertise it as 1200Mbis lan -_-

 Thanks!!

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [ar71xx] Add support for MERCURY MAC1200R

2015-01-11 Thread Bruno Randolf 
On 01/11/2015 09:25 PM, Gioacchino Mazzurco wrote:
 The device has two radios:
  - 802.11abgn AR9344 SoC, ath9k, working OK
  - 802.11ac QCA988x, ath10k, working in AP and STA modes

Interesting device. Can you post more specs, or add to the TOH wiki?

Thanks,
bruno
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel