ramips: fix support for Cudy r700

This PR fixes support for Cudy r700.

Original PR: https://github.com/openwrt/openwrt/pull/18532
Fixed:

- WAN port functionality;
- RESET button;
- Status LED;
- LAN port names consistent with the chassis;
- Merged partitions "debug", "backup" & "firmware"  to one partition "firmware" ("debug" & "backup" contained unimportant data);
- Removed redundant DTS elements.

Installation:

To install OpenWRT, you need the intermediate firmware from Cudy. (U-boot is locked). After installing the intermediate firmware, you can install OpenWRT via sysupgrade.

Recovery:

TFTP available.
1. Place the recovery.bin in the serving directory of your TFTP server.
2. Set your IP to 192.168.1.88/24.
3. Press the “Reset” button of Cudy router and hold it. Before the Cudy router is powered on and before TFTP start to download the firmware, don't release the “Reset” button.
4. Power on the Cudy router.
5. You can release the reset button only when TFTP starts downloading firmware.
6. When the SYSTEM LED turns solid green, the upgrade is complete.

Fixes: 75403dd1d05b ("ramips: add support for Cudy R700")
Link: https://github.com/openwrt/openwrt/pull/20756
(cherry picked from commit 35a86267e90312f24fd11553cd5a5db0736b79ca)
Signed-off-by: Marcin Leksmark <lexmark3200@wp.pl>
Link: https://github.com/openwrt/openwrt/pull/21068
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ramips/dts/mt7621_cudy_r700.dts b/target/linux/ramips/dts/mt7621_cudy_r700.dts
index 6d1c1ec004aad4365288b86f9b7ece708b60de03..ce23e1a701d4443e03e5c69585d2350c37f15a87 100644 (file)
--- a/target/linux/ramips/dts/mt7621_cudy_r700.dts
+++ b/target/linux/ramips/dts/mt7621_cudy_r700.dts
@@ -11,10 +11,9 @@
        model = "Cudy R700";
 
        aliases {
-               led-boot = &led_internet_blue;
-               led-failsafe = &led_internet_blue;
-               led-running = &led_internet_blue;
-               led-upgrade = &led_internet_blue;
+               led-boot = &led_status_green;
+               led-failsafe = &led_status_green;
+               led-running = &led_status_green;
                label-mac-device = &gmac0;
        };
 
@@ -27,7 +26,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -35,41 +34,11 @@
        leds {
                compatible = "gpio-leds";
 
-               led_internet_blue: internet_blue {
-                       label = "blue:internet";
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               internet_red {
-                       label = "red:internet";
-                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-               };
-
-               wan {
-                       function = LED_FUNCTION_WAN;
+               led_status_green: led-status-green {
                        color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
-
-               lan1 {
-                       label = "green:lan1";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-
-               lan2 {
-                       label = "green:lan2";
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-               };
-
-               lan3 {
-                       label = "green:lan3";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-               };
-
-               lan4 {
-                       label = "green:lan4";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-               };
        };
 };
 
@@ -107,38 +76,12 @@
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       eeprom_factory_0: eeprom@0 {
-                                               reg = <0x0 0x400>;
-                                       };
-
-                                       eeprom_factory_8000: eeprom@8000 {
-                                               reg = <0x8000 0x4da8>;
-                                       };
-                               };
                        };
 
                        partition@50000 {
                                compatible = "denx,uimage";
                                label = "firmware";
-                               reg = <0x50000 0xf80000>;
-                       };
-
-                       partition@fd0000 {
-                               label = "debug";
-                               reg = <0xfd0000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@fe0000 {
-                               label = "backup";
-                               reg = <0xfe0000 0x10000>;
-                               read-only;
+                               reg = <0x50000 0xfa0000>;
                        };
 
                        partition@ff0000 {
@@ -178,16 +121,20 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ethphy4 {
+       /delete-property/ interrupts;
+};
+
 &switch0 {
        ports {
                port@0 {
                        status = "okay";
-                       label = "lan1";
+                       label = "lan5";
                };
 
                port@1 {
                        status = "okay";
-                       label = "lan2";
+                       label = "lan4";
                };
 
                port@2 {
@@ -197,7 +144,7 @@
 
                port@3 {
                        status = "okay";
-                       label = "lan4";
+                       label = "lan2";
                };
        };
 };

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 31bdb40b26b61b41ed671654fc40dc5f449545d9..4184977b27e11acddb2b2f8a002b889f12f3c456 100644 (file)
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -801,7 +801,7 @@ define Device/cudy_r700
   DEVICE_MODEL := R700
   IMAGE_SIZE := 15872k
   UIMAGE_NAME := R29
-  DEVICE_PACKAGES := -uboot-envtools
+  DEVICE_PACKAGES := -uboot-envtools -wpad-basic-mbedtls
 endef
 TARGET_DEVICES += cudy_r700
 

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index 4c4e7a2f42ea43d519b9a6bbefbcb74b01b63301..94f36c1f6e4b37bbb76547fe5420b2d15bfb696d 100644 (file)
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -66,7 +66,6 @@ genexis,pulse-ex400|\
 netis,n6)
        ucidef_set_led_netdev "wan" "wan" "green:wan" "wan" "link tx rx"
        ;;
-cudy,r700|\
 cudy,wr2100)
        ucidef_set_led_netdev "lan1" "lan1" "green:lan1" "lan1"
        ucidef_set_led_netdev "lan2" "lan2" "green:lan2" "lan2"

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 15c98242adc52b419ffdb9d3b19a2074fdbfeb7b..557755064a82e3d2bd08a4435e964c756a1b0c77 100644 (file)
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -116,6 +116,7 @@ ramips_setup_interfaces()
                uci add_list firewall.@zone[1].network='eth_om'
                ;;
        cudy,c200p|\
+       cudy,r700|\
        mikrotik,routerboard-750gr3)
                ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
                ;;