Re: [OpenWrt-Devel] [PATCH] ramips: add support for Nexx WT3020 devices

2014-10-20 Thread John Crispin
Hi,

this patchs adds a patch rather than patch the files directly. please
submit a fixed version

John


On 19/10/2014 17:53, open...@rogerpueyo.com wrote:
 From: Roger Pueyo Centelles roger.pu...@guifi.net

 ---
  ...amips-add-support-for-Nexx-WT3020-devices.patch | 319 
 +
  target/linux/ramips/base-files/etc/board.d/01_leds |   3 +
  .../linux/ramips/base-files/etc/board.d/02_network |   1 +
  target/linux/ramips/base-files/etc/diag.sh |   3 +
  target/linux/ramips/base-files/lib/ramips.sh   |   3 +
  .../ramips/base-files/lib/upgrade/platform.sh  |   1 +
  target/linux/ramips/dts/WT3020-4M.dts  | 100 +++
  target/linux/ramips/dts/WT3020-8M.dts  | 100 +++
  target/linux/ramips/image/Makefile |   2 +
  9 files changed, 532 insertions(+)
  create mode 100644 0001-ramips-add-support-for-Nexx-WT3020-devices.patch
  create mode 100644 target/linux/ramips/dts/WT3020-4M.dts
  create mode 100644 target/linux/ramips/dts/WT3020-8M.dts

 diff --git a/0001-ramips-add-support-for-Nexx-WT3020-devices.patch 
 b/0001-ramips-add-support-for-Nexx-WT3020-devices.patch
 new file mode 100644
 index 000..a67b275
 --- /dev/null
 +++ b/0001-ramips-add-support-for-Nexx-WT3020-devices.patch
 @@ -0,0 +1,319 @@
 +From fceb829eca2bc088ad66b18099b57dc96f1bae43 Mon Sep 17 00:00:00 2001
 +From: Roger Pueyo Centelles roger.pu...@guifi.net
 +Date: Sun, 19 Oct 2014 17:50:01 +0200
 +Subject: [PATCH] ramips: add support for Nexx WT3020 devices
 +
 +---
 + target/linux/ramips/base-files/etc/board.d/01_leds |   3 +
 + .../linux/ramips/base-files/etc/board.d/02_network |   1 +
 + target/linux/ramips/base-files/etc/diag.sh |   3 +
 + target/linux/ramips/base-files/lib/ramips.sh   |   3 +
 + .../ramips/base-files/lib/upgrade/platform.sh  |   1 +
 + target/linux/ramips/dts/WT3020-4M.dts  | 100 
 +
 + target/linux/ramips/dts/WT3020-8M.dts  | 100 
 +
 + target/linux/ramips/image/Makefile |   2 +
 + 8 files changed, 213 insertions(+)
 + create mode 100644 target/linux/ramips/dts/WT3020-4M.dts
 + create mode 100644 target/linux/ramips/dts/WT3020-8M.dts
 +
 +diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds 
 b/target/linux/ramips/base-files/etc/board.d/01_leds
 +index 26f384d..7ca7ffb 100755
 +--- a/target/linux/ramips/base-files/etc/board.d/01_leds
  b/target/linux/ramips/base-files/etc/board.d/01_leds
 +@@ -213,6 +213,9 @@ case $board in
 + wt1520)
 + set_wifi_led rt2800pci-phy0::radio
 + ;;
 ++wt3020)
 ++ucidef_set_led_default power power nexx:blue:power 0
 ++;;
 + y1 |\
 + y1s)
 + ucidef_set_led_default power power lenovo:blue:power 1
 +diff --git a/target/linux/ramips/base-files/etc/board.d/02_network 
 b/target/linux/ramips/base-files/etc/board.d/02_network
 +index 7ecec5f..ff8fbc0 100755
 +--- a/target/linux/ramips/base-files/etc/board.d/02_network
  b/target/linux/ramips/base-files/etc/board.d/02_network
 +@@ -127,6 +127,7 @@ ramips_setup_interfaces()
 + hg255d | \
 + rt-n14u | \
 + wrtnode | \
 ++wt3020 | \
 + ur-326n4g | \
 + zbt-wa05)
 + ucidef_set_interfaces_lan_wan eth0.1 eth0.2
 +diff --git a/target/linux/ramips/base-files/etc/diag.sh 
 b/target/linux/ramips/base-files/etc/diag.sh
 +index aed7d6a..2977099 100755
 +--- a/target/linux/ramips/base-files/etc/diag.sh
  b/target/linux/ramips/base-files/etc/diag.sh
 +@@ -170,6 +170,9 @@ get_status_led() {
 + nexx-wt1520)
 + status_led=nexx-wt1520:white:power
 + ;;
 ++nexx-wt3020)
 ++status_led=nexx:blue:power
 ++;;
 + mzk-w300nh2)
 + status_led=mzkw300nh2:green:power
 + ;;
 +diff --git a/target/linux/ramips/base-files/lib/ramips.sh 
 b/target/linux/ramips/base-files/lib/ramips.sh
 +index 08c5dff..88fa623 100755
 +--- a/target/linux/ramips/base-files/lib/ramips.sh
  b/target/linux/ramips/base-files/lib/ramips.sh
 +@@ -184,6 +184,9 @@ ramips_board_detect() {
 + *Nexx WT1520)
 + name=wt1520
 + ;;
 ++*Nexx WT3020)
 ++name=wt3020
 ++;;
 + *NW718)
 + name=nw718
 + ;;
 +diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh 
 b/target/linux/ramips/base-files/lib/upgrade/platform.sh
 +index 61a0935..c9a418e 100755
 +--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
  b/target/linux/ramips/base-files/lib/upgrade/platform.sh
 +@@ -97,6 +97,7 @@ platform_check_image() {
 + wr8305rt |\
 + wrtnode |\
 + wt1520 |\
 ++wt3020 |\
 + x5 |\
 + x8 |\
 + y1 |\
 +diff --git a/target/linux/ramips/dts/WT3020-4M.dts 
 b/target/linux/ramips/dts/WT3020-4M.dts
 +new file mode 100644
 +index 000..7583680
 +--- /dev/null
  b/target/linux/ramips/dts/WT3020-4M.dts
 +@@ 

[OpenWrt-Devel] [PATCH] ramips: add support for Nexx WT3020 devices

2014-10-19 Thread openwrt
From: Roger Pueyo Centelles roger.pu...@guifi.net

---
 target/linux/ramips/base-files/etc/board.d/01_leds |   3 +
 .../linux/ramips/base-files/etc/board.d/02_network |   1 +
 target/linux/ramips/base-files/etc/diag.sh |   3 +
 target/linux/ramips/base-files/lib/ramips.sh   |   3 +
 .../ramips/base-files/lib/upgrade/platform.sh  |  23 ++---
 target/linux/ramips/dts/WT3020-4M.dts  | 100 +
 target/linux/ramips/dts/WT3020-8M.dts  | 100 +
 target/linux/ramips/image/Makefile |   2 +
 8 files changed, 224 insertions(+), 11 deletions(-)
 create mode 100644 target/linux/ramips/dts/WT3020-4M.dts
 create mode 100644 target/linux/ramips/dts/WT3020-8M.dts

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds 
b/target/linux/ramips/base-files/etc/board.d/01_leds
index 26f384d..7ca7ffb 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -213,6 +213,9 @@ case $board in
wt1520)
set_wifi_led rt2800pci-phy0::radio
;;
+   wt3020)
+   ucidef_set_led_default power power nexx:blue:power 0
+   ;;
y1 |\
y1s)
ucidef_set_led_default power power lenovo:blue:power 1
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network 
b/target/linux/ramips/base-files/etc/board.d/02_network
index 7ecec5f..ff8fbc0 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -127,6 +127,7 @@ ramips_setup_interfaces()
hg255d | \
rt-n14u | \
wrtnode | \
+   wt3020 | \
ur-326n4g | \
zbt-wa05)
ucidef_set_interfaces_lan_wan eth0.1 eth0.2
diff --git a/target/linux/ramips/base-files/etc/diag.sh 
b/target/linux/ramips/base-files/etc/diag.sh
index aed7d6a..2977099 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -170,6 +170,9 @@ get_status_led() {
nexx-wt1520)
status_led=nexx-wt1520:white:power
;;
+   nexx-wt3020)
+   status_led=nexx:blue:power
+   ;;
mzk-w300nh2)
status_led=mzkw300nh2:green:power
;;
diff --git a/target/linux/ramips/base-files/lib/ramips.sh 
b/target/linux/ramips/base-files/lib/ramips.sh
index 08c5dff..88fa623 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -184,6 +184,9 @@ ramips_board_detect() {
*Nexx WT1520)
name=wt1520
;;
+   *Nexx WT3020)
+   name=wt3020
+   ;;
*NW718)
name=nw718
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh 
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 52f3f0a..0d8bc44 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -78,30 +78,31 @@ platform_check_image() {
sl-r7205 | \
tew-691gr | \
tew-692gr | \
-   w306r-v20 |\
-   w502u |\
-   wr6202 |\
+   ur-326n4g |\
+   ur-336un |\
v22rw-2x2 | \
vocore | \
+   w306r-v20 |\
+   w502u |\
+   whr-g300n |\
wl341v3 | \
wl-330n | \
wl-330n3g | \
wl-351 | \
-   wnce2001 | \
wli-tx4-ag300n | \
-   whr-g300n |\
-   wt1520 |\
-   ur-326n4g |\
-   ur-336un |\
-   wr512-3gn |\
wmr300 |\
+   wnce2001 | \
+   wr512-3gn |\
+   wr6202 |\
wr8305rt |\
wrtnode |\
+   wt1520 |\
+   wt3020 |\
x5 |\
x8 |\
-   zbt-wa05 |\
y1 |\
-   y1s)
+   y1s |\
+   zbt-wa05)
[ $magic != 27051956 ]  {
echo Invalid image type.
return 1
diff --git a/target/linux/ramips/dts/WT3020-4M.dts 
b/target/linux/ramips/dts/WT3020-4M.dts
new file mode 100644
index 000..7583680
--- /dev/null
+++ b/target/linux/ramips/dts/WT3020-4M.dts
@@ -0,0 +1,100 @@
+/dts-v1/;
+
+/include/ mt7620n.dtsi
+
+/ {
+   compatible = wt3020, ralink,mt7620n-soc;
+   model = Nexx WT3020;
+
+   palmbus@1000 {
+gpio2: gpio@660 {
+status = okay;
+};
+
+gpio3: gpio@688 {
+status = okay;
+};
+
+   spi@b00 {
+   status = okay;
+
+   m25p80@0 {
+   #address-cells = 1;
+   #size-cells = 1;
+   compatible = w25q32;
+   reg = 0 0;
+   linux,modalias = m25p80, w25q32;
+  

Re: [OpenWrt-Devel] [PATCH] ramips: add support for Nexx WT3020 devices

2014-10-19 Thread John Crispin
Hi,

can you send the reordering part of the patch as a separate patch please ?

John

On 19/10/2014 16:46, open...@rogerpueyo.com wrote:
 diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh 
 b/target/linux/ramips/base-files/lib/upgrade/platform.sh
 index 52f3f0a..0d8bc44 100755
 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
 @@ -78,30 +78,31 @@ platform_check_image() {
   sl-r7205 | \
   tew-691gr | \
   tew-692gr | \
 - w306r-v20 |\
 - w502u |\
 - wr6202 |\
 + ur-326n4g |\
 + ur-336un |\
   v22rw-2x2 | \
   vocore | \
 + w306r-v20 |\
 + w502u |\
 + whr-g300n |\
   wl341v3 | \
   wl-330n | \
   wl-330n3g | \
   wl-351 | \
 - wnce2001 | \
   wli-tx4-ag300n | \
 - whr-g300n |\
 - wt1520 |\
 - ur-326n4g |\
 - ur-336un |\
 - wr512-3gn |\
   wmr300 |\
 + wnce2001 | \
 + wr512-3gn |\
 + wr6202 |\
   wr8305rt |\
   wrtnode |\
 + wt1520 |\
 + wt3020 |\
   x5 |\
   x8 |\
 - zbt-wa05 |\
   y1 |\
 - y1s)
 + y1s |\
 + zbt-wa05)
   [ $magic != 27051956 ]  {
   echo Invalid image type.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] ramips: add support for Nexx WT3020 devices

2014-10-19 Thread openwrt
From: Roger Pueyo Centelles roger.pu...@guifi.net

---
 ...amips-add-support-for-Nexx-WT3020-devices.patch | 319 +
 target/linux/ramips/base-files/etc/board.d/01_leds |   3 +
 .../linux/ramips/base-files/etc/board.d/02_network |   1 +
 target/linux/ramips/base-files/etc/diag.sh |   3 +
 target/linux/ramips/base-files/lib/ramips.sh   |   3 +
 .../ramips/base-files/lib/upgrade/platform.sh  |   1 +
 target/linux/ramips/dts/WT3020-4M.dts  | 100 +++
 target/linux/ramips/dts/WT3020-8M.dts  | 100 +++
 target/linux/ramips/image/Makefile |   2 +
 9 files changed, 532 insertions(+)
 create mode 100644 0001-ramips-add-support-for-Nexx-WT3020-devices.patch
 create mode 100644 target/linux/ramips/dts/WT3020-4M.dts
 create mode 100644 target/linux/ramips/dts/WT3020-8M.dts

diff --git a/0001-ramips-add-support-for-Nexx-WT3020-devices.patch 
b/0001-ramips-add-support-for-Nexx-WT3020-devices.patch
new file mode 100644
index 000..a67b275
--- /dev/null
+++ b/0001-ramips-add-support-for-Nexx-WT3020-devices.patch
@@ -0,0 +1,319 @@
+From fceb829eca2bc088ad66b18099b57dc96f1bae43 Mon Sep 17 00:00:00 2001
+From: Roger Pueyo Centelles roger.pu...@guifi.net
+Date: Sun, 19 Oct 2014 17:50:01 +0200
+Subject: [PATCH] ramips: add support for Nexx WT3020 devices
+
+---
+ target/linux/ramips/base-files/etc/board.d/01_leds |   3 +
+ .../linux/ramips/base-files/etc/board.d/02_network |   1 +
+ target/linux/ramips/base-files/etc/diag.sh |   3 +
+ target/linux/ramips/base-files/lib/ramips.sh   |   3 +
+ .../ramips/base-files/lib/upgrade/platform.sh  |   1 +
+ target/linux/ramips/dts/WT3020-4M.dts  | 100 +
+ target/linux/ramips/dts/WT3020-8M.dts  | 100 +
+ target/linux/ramips/image/Makefile |   2 +
+ 8 files changed, 213 insertions(+)
+ create mode 100644 target/linux/ramips/dts/WT3020-4M.dts
+ create mode 100644 target/linux/ramips/dts/WT3020-8M.dts
+
+diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds 
b/target/linux/ramips/base-files/etc/board.d/01_leds
+index 26f384d..7ca7ffb 100755
+--- a/target/linux/ramips/base-files/etc/board.d/01_leds
 b/target/linux/ramips/base-files/etc/board.d/01_leds
+@@ -213,6 +213,9 @@ case $board in
+   wt1520)
+   set_wifi_led rt2800pci-phy0::radio
+   ;;
++  wt3020)
++  ucidef_set_led_default power power nexx:blue:power 0
++  ;;
+   y1 |\
+   y1s)
+   ucidef_set_led_default power power lenovo:blue:power 1
+diff --git a/target/linux/ramips/base-files/etc/board.d/02_network 
b/target/linux/ramips/base-files/etc/board.d/02_network
+index 7ecec5f..ff8fbc0 100755
+--- a/target/linux/ramips/base-files/etc/board.d/02_network
 b/target/linux/ramips/base-files/etc/board.d/02_network
+@@ -127,6 +127,7 @@ ramips_setup_interfaces()
+   hg255d | \
+   rt-n14u | \
+   wrtnode | \
++  wt3020 | \
+   ur-326n4g | \
+   zbt-wa05)
+   ucidef_set_interfaces_lan_wan eth0.1 eth0.2
+diff --git a/target/linux/ramips/base-files/etc/diag.sh 
b/target/linux/ramips/base-files/etc/diag.sh
+index aed7d6a..2977099 100755
+--- a/target/linux/ramips/base-files/etc/diag.sh
 b/target/linux/ramips/base-files/etc/diag.sh
+@@ -170,6 +170,9 @@ get_status_led() {
+   nexx-wt1520)
+   status_led=nexx-wt1520:white:power
+   ;;
++  nexx-wt3020)
++  status_led=nexx:blue:power
++  ;;
+   mzk-w300nh2)
+   status_led=mzkw300nh2:green:power
+   ;;
+diff --git a/target/linux/ramips/base-files/lib/ramips.sh 
b/target/linux/ramips/base-files/lib/ramips.sh
+index 08c5dff..88fa623 100755
+--- a/target/linux/ramips/base-files/lib/ramips.sh
 b/target/linux/ramips/base-files/lib/ramips.sh
+@@ -184,6 +184,9 @@ ramips_board_detect() {
+   *Nexx WT1520)
+   name=wt1520
+   ;;
++  *Nexx WT3020)
++  name=wt3020
++  ;;
+   *NW718)
+   name=nw718
+   ;;
+diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh 
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+index 61a0935..c9a418e 100755
+--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
 b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+@@ -97,6 +97,7 @@ platform_check_image() {
+   wr8305rt |\
+   wrtnode |\
+   wt1520 |\
++  wt3020 |\
+   x5 |\
+   x8 |\
+   y1 |\
+diff --git a/target/linux/ramips/dts/WT3020-4M.dts 
b/target/linux/ramips/dts/WT3020-4M.dts
+new file mode 100644
+index 000..7583680
+--- /dev/null
 b/target/linux/ramips/dts/WT3020-4M.dts
+@@ -0,0 +1,100 @@
++/dts-v1/;
++
++/include/ mt7620n.dtsi
++
++/ {
++  compatible = wt3020, ralink,mt7620n-soc;
++  model = Nexx WT3020;
++
++  palmbus@1000 {
++gpio2: