ramips: add support for DLINK DWR-921-C1 #793

fid0did0 · 2018-03-10T09:59:03Z

The DWR-921-C1 Wireless Routers with LTE embedded modem is based on the MT7620N SoC.

Specification:

MediaTek MT7620N (580 Mhz)
64 MB of RAM
16 MB of FLASH
802.11bgn radio
5x 10/100 Mbps Ethernet (1 WAN and 4 LAN)
2x external, detachable (LTE) antennas
UART header on PCB (57600 8n1)
6x LED (GPIO-controlled)
1xbi-color Signal Strength LED (GPIO-controlled)
2x button
JBOOT bootloader

Known issues:

LTE Modem not yet working (subject for a new PR)
No status led has been assigned

Installation:
Apply factory image via d-link http web-gui.

How to revert to OEM firmware:
1.) Push the reset button and turn on the power. Wait until LED start blinking (~10sec.)
2.) Upload original factory image via JBOOT http (IP: 192.168.123.254)
3.) If http doesn't work, it can be done with curl command:
curl -F FN=@XXXXX.bin http://192.168.123.254/upg
where XXXXX.bin is name of firmware file.

Signed-off-by: Giuseppe Lippolis giu.lippolis@gmail.com

fid0did0 · 2018-03-10T10:02:19Z

This PR requires the following commit to build properly:

0b767b8
280e7cb
4070f7d

fid0did0 · 2018-03-10T10:04:21Z

The dwr-921 doesn't have a led suitable for the status led function.
The power led seems not be driven by gpio but hardwired do vcc.

Is there an alternative solution to share some led function?

fid0did0 · 2018-03-10T10:08:01Z

Currently I plan to use the mt7620 capability to drive the wlan led.

in /sys/class/leds/ I can see the following folder:
rt2800soc-phy0::assoc rt2800soc-phy0::quality rt2800soc-phy0::radio

but if I try to drive them (writing in brightness) nothing happens.

If I configure the wlan led as gpio driven in the device-tree, it works as expected.

fid0did0 · 2018-03-13T18:28:14Z

What about if I configure a potential shared led (like the sms as an example) acting as status led?

CHKDSK88

I marked some points. You could consider to make changes.

CHKDSK88 · 2018-03-18T15:19:00Z

target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom

@@ -41,6 +41,12 @@ board=$(board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
 	case $board in
+	dwr-921-c1)


Should be like bellow?
dlink,dwr-116-a1|\
dlink,dwr-921-c1)

I set the board name "dwr-921-c1" in the target/linux/ramips/base-files/lib/ramips.sh

I set the "dwr-921-c1" name in target/linux/ramips/base-files/lib/ramips.sh

CHKDSK88 · 2018-03-18T15:19:08Z

target/linux/ramips/base-files/lib/ramips.sh

@@ -169,6 +169,9 @@ ramips_board_detect() {
 	*"DWR-512 B")
 		name="dwr-512-b"
 		;;
+	*"DWR-921 C1")


Do You test generic board detection?

I prefer to be coherent with the format used in the file.

@fid0did0 You should really consider @CHKDSK88 input (which is much appreciated by the way - as it safes my time), as I've done a full review of his PR recently.

Drop this line to use the generic board detection. Which means, use dlink,dwr-921-c1 as userspace boardname. Instead of sticking to an outdated way of doing something, you should check the commit history to see how it was done for all recent ramips additions.

CHKDSK88 · 2018-03-18T15:20:17Z

target/linux/ramips/base-files/etc/board.d/01_leds

@@ -158,6 +158,7 @@ dir-615-h1)
 	set_wifi_led "rt2800pci-phy0::radio"
 	;;
 dir-620-d1|\
+dwr-921-c1|\


dlink,dwr-921-c1 ?

I prefer to be coherent with the format used in the file.

CHKDSK88 · 2018-03-18T15:22:58Z

target/linux/ramips/dts/DWR-921-C1.dts

+};
+
+&ethernet {
+	mtd-mac-address = <&config 0xe2ac>;


I think, You should use jboot-tools to set IP. It's possible, that some another C1 have different offset. Like in DWR-116.

CHKDSK88 · 2018-03-18T15:23:45Z

target/linux/ramips/dts/DWR-921-C1.dts

+	};
+};
+
+&wmac {


You use 10-rt2x00-eeprom. This should be droped.

fid0did0 · 2018-03-19T17:53:49Z

fixed the comments and the conflict.

@mkresin
Do you have some advice about the leds (wifi, status)?

Bye.

mkresin · 2018-03-20T11:35:53Z

Do you have some advice about the leds (wifi, status)?

The wifi LED setup look good to me. Do I miss something?

We might can misuse the "Signal Strength" LED as status LED and set it to off after boot in 01_leds:

dlink,dwr-921-c1)
 	set_wifi_led "$boardname:green:wifi"
	ucidef_set_led_default "sigstrength" "Signal Strength" "$boardname:green:sigstrength" "0"
 	;;

It might make sense to to use ucidef_set_led_switch to make the lan led working.

fid0did0 · 2018-03-20T18:10:22Z

thanks for the advice mkresin.
I will fix the led accordingly.

About the wifi led I would like to let it drive by the HW.
I try to remove the wifi led definition and configure in the dts the wled as below:

     wled_pins: wled {
                wled {
                        ralink,group = "wled";
                        ralink,function = "wled";
                };
        };

but when I set the value in
/sys/class/leds/rt2800soc-phy0::assoc, rt2800soc-phy0::quality, rt2800soc-phy0::radio
nothing happens.

I'm making something wrong?

CHKDSK88 · 2018-03-20T18:45:46Z

target/linux/ramips/base-files/lib/upgrade/platform.sh

@@ -271,7 +271,8 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	dlink,dwr-116-a1)
+	dlink,dwr-116-a1|\
+	dwr-921-c1)


dlink,dwr-921-c1?

mkresin · 2018-03-21T07:29:54Z

About the wifi led I would like to let it drive by the HW.

To my knowledge it doesn't work, hence the LED is set for all boards to GPIO. I never had a look at the code why it doesn't work or how it is supposed to work.

CHKDSK88 · 2018-03-21T12:12:30Z

@fid0did0

You forgot about MAC setup in 02network.

CHKDSK88 · 2018-03-21T16:44:27Z

target/linux/ramips/dts/DWR-921-C1.dts

+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "d-link,dwr-921-c1", "ralink,mt7620n-soc";


"d-link,dwr-921-c1" -> "dlink,dwr-921-c1"

Did You test it @fid0did0 ?

CHKDSK88 · 2018-03-21T17:29:28Z

target/linux/ramips/dts/DWR-921-C1.dts

+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+		};
+	};
+


gpio_export {
compatible = "gpio-export";
#size-cells = <0>;

usb_power {
gpio-export,name = "usb";
gpio-export,output = <1>;
gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
};
};

I have C3 version and pcb is the same. Please try add this and check if modem is detected.

The LTE support is argument for a new PR.
Please see PR #812.

CHKDSK88 · 2018-03-21T20:01:21Z

target/linux/ramips/image/mt7620.mk

+  DTS := DWR-921-C1
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DEVICE_TITLE := D-Link DWR-921 C1
+  DLINK_ROM_ID := DLK6E2414001


Missed:
DEVICE_PACKAGES := jboot-tools

fid0did0 · 2018-03-22T16:09:11Z

All the open point are now fixed.
I tested the image, now the mac are configured as below:
lan mac= wifi mac
wan mac=lan mac +1

mkresin · 2018-03-23T16:04:35Z

target/linux/ramips/base-files/etc/board.d/01_leds

@@ -162,6 +162,11 @@ dlink,dwr-116-a1|\
 mzk-ex300np)
 	set_wifi_led "$boardname:green:wifi"
 	;;
+dlink,dwr-921-c1)
+	set_wifi_led "$boardname:green:wifi"
+	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "br-lan"


You really make it harder than it has to be...

Please don't do it this way. You most likely will not find any example in the tree using a not physical interface with the netdev trigger.

Please use ucidef_set_led_switch as suggested. The hex value used for the trigger is a binary mask selecting the switch ports which should trigger the LED. It has to be read from right (port 0) to left (port 4). For your board the following should do the trick:

ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f"

mkresin · 2018-03-23T16:06:54Z

target/linux/ramips/base-files/etc/board.d/01_leds

+dlink,dwr-921-c1)
+	set_wifi_led "$boardname:green:wifi"
+	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "br-lan"
+	ucidef_set_led_default "sigstrength" "Signal Strength" "$boardname:red:sigstrength" "0"


Normally I've ignored it, but as you have to touch the file anyway: Can we use the green sigstrength led for diag? red leds are usually used for warning/error. For sure a matter of taste and nothing really critical.

I personally prefer the red to keep the attention high during the sysupgrade operation.
But I changed in green.

Bye.

The DWR-921-C1 Wireless Routers with LTE embedded modem is based on the MT7620N SoC. Specification: * MediaTek MT7620N (580 Mhz) * 64 MB of RAM * 16 MB of FLASH * 802.11bgn radio * 5x 10/100 Mbps Ethernet (1 WAN and 4 LAN) * 2x external, detachable (LTE) antennas * UART header on PCB (57600 8n1) * 6x LED (GPIO-controlled) * 1xbi-color Signal Strength LED (GPIO-controlled) * 2x button * JBOOT bootloader Known issues: * LTE Modem not yet working (subject for a new PR) * The status led has been assigned to the dwr-921-c1:green:sigstrength (lte signal strength led). At the end of the boot it is switched off and is available for lte operation. Work correctly also during sysupgrade operation. Installation: Apply factory image via d-link http web-gui. How to revert to OEM firmware: 1.) Push the reset button and turn on the power. Wait until LED start blinking (~10sec.) 2.) Upload original factory image via JBOOT http (IP: 192.168.123.254) 3.) If http doesn't work, it can be done with curl command: curl -F FN=@XXXXX.bin http://192.168.123.254/upg where XXXXX.bin is name of firmware file. Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>

mkresin · 2018-03-23T19:46:05Z

merged into my staging tree.

fid0did0 force-pushed the dwr-921-c1_board_porting branch from ac3798d to 6ed25e0 Compare March 10, 2018 10:45

dedeckeh added the target/ramips pull request/issue for ramips target label Mar 12, 2018

fid0did0 force-pushed the dwr-921-c1_board_porting branch 3 times, most recently from d0cdcd8 to c310138 Compare March 18, 2018 15:01

CHKDSK88 reviewed Mar 18, 2018

View reviewed changes

fid0did0 force-pushed the dwr-921-c1_board_porting branch 3 times, most recently from d294293 to 432afb0 Compare March 19, 2018 17:45

CHKDSK88 reviewed Mar 20, 2018

View reviewed changes

CHKDSK88 reviewed Mar 21, 2018

View reviewed changes

fid0did0 force-pushed the dwr-921-c1_board_porting branch from 432afb0 to 1eb7f3b Compare March 22, 2018 16:05

fid0did0 mentioned this pull request Mar 22, 2018

ramips: add lte-modem support on dlink dwr-921-c1 #812

Closed

CHKDSK88 mentioned this pull request Mar 22, 2018

ramips: add support for DLINK DWR-921-C3 #813

Closed

mkresin requested changes Mar 23, 2018

View reviewed changes

fid0did0 force-pushed the dwr-921-c1_board_porting branch from 1eb7f3b to 53c72c6 Compare March 23, 2018 18:49

mkresin closed this Mar 23, 2018

fid0did0 deleted the dwr-921-c1_board_porting branch April 20, 2018 17:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ramips: add support for DLINK DWR-921-C1 #793

ramips: add support for DLINK DWR-921-C1 #793

fid0did0 commented Mar 10, 2018 •

edited

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 13, 2018

CHKDSK88 left a comment

CHKDSK88 Mar 18, 2018

fid0did0 Mar 18, 2018 •

edited

fid0did0 Mar 18, 2018

CHKDSK88 Mar 18, 2018

fid0did0 Mar 18, 2018

mkresin Mar 18, 2018 •

edited

CHKDSK88 Mar 18, 2018

fid0did0 Mar 18, 2018

CHKDSK88 Mar 18, 2018

CHKDSK88 Mar 18, 2018

fid0did0 commented Mar 19, 2018

mkresin commented Mar 20, 2018

fid0did0 commented Mar 20, 2018

CHKDSK88 Mar 20, 2018

mkresin commented Mar 21, 2018

CHKDSK88 commented Mar 21, 2018

CHKDSK88 Mar 21, 2018

CHKDSK88 Mar 21, 2018

fid0did0 Mar 22, 2018 •

edited

CHKDSK88 Mar 21, 2018

fid0did0 commented Mar 22, 2018 •

edited

mkresin Mar 23, 2018 •

edited

fid0did0 Mar 23, 2018

mkresin Mar 23, 2018

fid0did0 Mar 23, 2018 •

edited

mkresin commented Mar 23, 2018

+              	};
+              };
+              &wmac {

ramips: add support for DLINK DWR-921-C1 #793

ramips: add support for DLINK DWR-921-C1 #793

Conversation

fid0did0 commented Mar 10, 2018 • edited

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 10, 2018

fid0did0 commented Mar 13, 2018

CHKDSK88 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fid0did0 Mar 18, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkresin Mar 18, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fid0did0 commented Mar 19, 2018

mkresin commented Mar 20, 2018

fid0did0 commented Mar 20, 2018

Choose a reason for hiding this comment

mkresin commented Mar 21, 2018

CHKDSK88 commented Mar 21, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fid0did0 Mar 22, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fid0did0 commented Mar 22, 2018 • edited

mkresin Mar 23, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fid0did0 Mar 23, 2018 • edited

Choose a reason for hiding this comment

mkresin commented Mar 23, 2018

fid0did0 commented Mar 10, 2018 •

edited

fid0did0 Mar 18, 2018 •

edited

mkresin Mar 18, 2018 •

edited

fid0did0 Mar 22, 2018 •

edited

fid0did0 commented Mar 22, 2018 •

edited

mkresin Mar 23, 2018 •

edited

fid0did0 Mar 23, 2018 •

edited