From 608b9d15b6da9b6dac2581fc9804627bbb110560 Mon Sep 17 00:00:00 2001 From: google-you-ok? <84753324+LPDDR6-10000MHz@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:03:39 +0800 Subject: [PATCH] rockchip:fix nanopi-r4s mac address (#9059) * 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 --- .../rockchip/armv8/base-files/etc/board.d/02_network | 6 +++++- ...-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 11 +++-------- ...-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 11 +++-------- ...-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 11 +++-------- 4 files changed, 14 insertions(+), 25 deletions(-) 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 44eb3b4f1..aa91bd9a6 100755 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -48,7 +48,11 @@ rockchip_setup_macs() lan_mac=$(macaddr_add "$wan_mac" +1) ;; 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") ;; xunlong,orangepi-r1-plus|\ diff --git a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..a5631b632 100644 --- a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -8,20 +8,15 @@ stores the MAC address. Signed-off-by: Tianling Shen --- - .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) + .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++ +1 file changed, 13 insertions(+) --- a/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"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02"; diff --git a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..a5631b632 100644 --- a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -8,20 +8,15 @@ stores the MAC address. Signed-off-by: Tianling Shen --- - .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) + .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++ +1 file changed, 13 insertions(+) --- a/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"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02"; diff --git a/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..a5631b632 100644 --- a/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -8,20 +8,15 @@ stores the MAC address. Signed-off-by: Tianling Shen --- - .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) + .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 13 +++++++++++++ +1 file changed, 13 insertions(+) --- a/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"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02";