298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rockchip:fix nanopi-r4s mac address (#9059)

Browse Source 
* Update 02_network

* Update 007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch

* Update 007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch

* Update 010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
This commit is contained in:
google-you-ok? 2022-03-14 14:03:39 +08:00 committed by GitHub
parent b44fe03968
commit 608b9d15b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/rockchip/armv8/base-files/etc/board.d/02_network
View File

@ -48,7 +48,11 @@ rockchip_setup_macs()
lan_mac=$(macaddr_add "$wan_mac" +1) lan_mac=$(macaddr_add "$wan_mac" +1)
;; ;;
friendlyarm,nanopi-r4s) friendlyarm,nanopi-r4s)
wan_mac=$(get_mac_binary "/sys/bus/i2c/devices/2-0051/eeprom" 0xfa) if [ -f /sys/bus/i2c/devices/2-0051/eeprom ]; then
wan_mac=$(get_mac_binary "/sys/bus/i2c/devices/2-0051/eeprom" 0xfa)
else
wan_mac=$(nanopi_r2s_generate_mac)
fi
lan_mac=$(macaddr_setbit_la "$wan_mac") lan_mac=$(macaddr_setbit_la "$wan_mac")
;; ;;
xunlong,orangepi-r1-plus|\ xunlong,orangepi-r1-plus|\

11
target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -8,20 +8,15 @@ stores the MAC address.
Signed-off-by: Tianling Shen <cnsztl@gmail.com> Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- ---
.../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++
1 file changed, 18 insertions(+) 1 file changed, 13 insertions(+)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -68,6 +68,24 @@ @@ -75,6 +75,19 @@ &emmc_phy {
status = "disabled"; status = "disabled";
}; };
+&gmac {
+ nvmem-cells = <&mac_address>;
+ nvmem-cell-names = "mac-address";
+};
+
+&i2c2 { +&i2c2 {
+ eeprom@51 { + eeprom@51 {
+ compatible = "microchip,24c02", "atmel,24c02"; + compatible = "microchip,24c02", "atmel,24c02";

11
target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -8,20 +8,15 @@ stores the MAC address.
Signed-off-by: Tianling Shen <cnsztl@gmail.com> Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- ---
.../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++
1 file changed, 18 insertions(+) 1 file changed, 13 insertions(+)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -68,6 +68,24 @@ @@ -75,6 +75,19 @@ &emmc_phy {
status = "disabled"; status = "disabled";
}; };
+&gmac {
+ nvmem-cells = <&mac_address>;
+ nvmem-cell-names = "mac-address";
+};
+
+&i2c2 { +&i2c2 {
+ eeprom@51 { + eeprom@51 {
+ compatible = "microchip,24c02", "atmel,24c02"; + compatible = "microchip,24c02", "atmel,24c02";

11
target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -8,20 +8,15 @@ stores the MAC address.
Signed-off-by: Tianling Shen <cnsztl@gmail.com> Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- ---
.../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++
1 file changed, 18 insertions(+) 1 file changed, 13 insertions(+)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -68,6 +68,24 @@ @@ -75,6 +75,19 @@ &emmc_phy {
status = "disabled"; status = "disabled";
}; };
+&gmac {
+ nvmem-cells = <&mac_address>;
+ nvmem-cell-names = "mac-address";
+};
+
+&i2c2 { +&i2c2 {
+ eeprom@51 { + eeprom@51 {
+ compatible = "microchip,24c02", "atmel,24c02"; + compatible = "microchip,24c02", "atmel,24c02";