The host-index-min property is invalid, so it inherits from the sdmmc definition in dtsi.

Signed-off-by: Xiaobo Tian peterwillcn@gmail.com --- arch/arm/dts/rk3399-nanopi-r4s.dts | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 7470c26820..f663bc87a5 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -116,10 +116,6 @@ status = "disabled"; };

-&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; };

Remove the recommended MAC address from the network card. NanoPi R4S has a EEPROM attached to the 2nd I2C bus (U92), which stores the MAC address.

Signed-off-by: Xiaobo Tian peterwillcn@gmail.com --- arch/arm/dts/rk3399-nanopi-r4s.dts | 15 --------------- 1 file changed, 15 deletions(-)

diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index f663bc87a5..042c73ca17 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,10 +17,6 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";

- aliases { - ethernet1 = &r8169; - }; - vdd_5v: vdd-5v { compatible = "regulator-fixed"; regulator-name = "vdd_5v"; @@ -95,17 +91,6 @@ max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; };

&sdhci {

Data transmission on the I2C4 bus is not required during the system boot process, so it is disabled

Signed-off-by: Xiaobo Tian peterwillcn@gmail.com --- arch/arm/dts/rk3399-nanopi-r4s.dts | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 042c73ca17..e5f57dd51a 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -69,6 +69,10 @@ status = "disabled"; };

+&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;

Xiaobo Tian peterwillcn@gmail.com 于2021年7月6日周二 下午10:44写道：

Correct the LEDS label name and remove the board type prefix, which is actually unnecessary here, removes the redefined system status LED pin.

Signed-off-by: Xiaobo Tian peterwillcn@gmail.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

arch/arm/dts/rk3399-nanopi-r4s.dts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..7470c26820 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -76,18 +76,17 @@ &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;

•           label = "nanopi-r4s:green:lan";
  

•           label = "green:lan";
    };
  
    wan_led: led-2 {
            gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
  

•           label = "nanopi-r4s:green:wan";
  

•           label = "green:wan";
    };
  

};

&leds_gpio { rockchip,pins =

•           <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
            <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
            <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
  

};

2.32.0