rockchip: add led and network config to nanopi r6s

We need to configure the led and network config for this board on
start as per the others

Signed-off-by: Ben Whitten <ben.whitten@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15607
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
index ef894610560f268298766ae3c10d30dee681f911..6f6dfbf73ebe3fdd23e81f9242c2288f802a1768 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
@@ -28,6 +28,11 @@ friendlyarm,nanopi-r5s)
        ucidef_set_led_netdev "lan1" "LAN1" "green:lan-1" "eth1"
        ucidef_set_led_netdev "lan2" "LAN2" "green:lan-2" "eth2"
        ;;
+friendlyarm,nanopi-r6s)
+       ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth1"
+       ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth2"
+       ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "eth0"
+       ;;
 esac
 
 board_config_flush

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
index f1192c93719960d76552eb9af7fda9e43d8815d6..506ef672454f030f2c102d6d95370f310aabaa28 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -24,6 +24,9 @@ rockchip_setup_interfaces()
        friendlyarm,nanopi-r5s)
                ucidef_set_interfaces_lan_wan 'eth1 eth2' 'eth0'
                ;;
+       friendlyarm,nanopi-r6s)
+               ucidef_set_interfaces_lan_wan 'eth0 eth2' 'eth1'
+               ;;
        sinovoip,rk3568-bpi-r2pro)
                ucidef_set_interfaces_lan_wan 'lan0 lan1 lan2 lan3' 'eth0'
                ;;
@@ -57,7 +60,8 @@ rockchip_setup_macs()
                wan_mac=$(get_mac_binary "/sys/bus/i2c/devices/2-0051/eeprom" 0xfa)
                lan_mac=$(macaddr_setbit_la "$wan_mac")
                ;;
-       friendlyarm,nanopi-r5c)
+       friendlyarm,nanopi-r5c|\
+       friendlyarm,nanopi-r6s)
                wan_mac=$(macaddr_generate_from_mmc_cid mmcblk*)
                lan_mac=$(macaddr_add "$wan_mac" 1)
                ;;

diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
index 8bbce1c32857e4edd96551adc3427b6d84281e93..5716aaf4967cc85c3badf3c012d29f5c03edcbf2 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
+++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
@@ -49,7 +49,8 @@ sinovoip,rk3568-bpi-r2pro)
        set_interface_core 2 "eth0"
        set_interface_core 4 "eth1"
        ;;
-friendlyarm,nanopi-r5s)
+friendlyarm,nanopi-r5s|\
+friendlyarm,nanopi-r6s)
        set_interface_core 2 "eth0"
        set_interface_core 4 "eth1"
        set_interface_core 8 "eth2"