1. Modify the VCC VDD power layout 2. Modify Ethernet1 interface of PCIE0

Reviewed-by: Kever Yang kever.yang@rock-chips.com Signed-off-by: xiaobo peterwillcn@gmail.com --- arch/arm/dts/rk3399-nanopi-r4s.dts | 85 ++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 22 deletions(-)

diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..ae22363072 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,19 +17,65 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";

- aliases { - ethernet1 = &r8169; + chosen { + stdout-path = "serial2:1500000n8"; + }; + + vcc1v8_s3: vcc1v8-s3 { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_s3"; + vin-supply = <&vcc_1v8>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_pwr_h>; + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc3v0_sd"; + vin-supply = <&vcc3v3_sys>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sys"; + }; + + vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_sys"; + vin-supply = <&vdd_5v>; };

vdd_5v: vdd-5v { compatible = "regulator-fixed"; - regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; + regulator-name = "vdd_5v"; };

fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +119,39 @@ status = "disabled"; };

+&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; + }; + + sys_led: led-sys { + default-state = "on"; + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "red:sys"; };

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>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; };

&pcie0 { 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 { @@ -132,7 +177,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -};