1. R4S passive silent heat dissipation based on metal housing, no active heat dissipation by fan, so PWM-Fan and CPU_Thermal are removed 2. Modify Ethernet1 interface of PCIE0 3. Modify the VCC VDD power layout
Signed-off-by: xiaobo peterwillcn@gmail.com --- arch/arm/dts/rk3399-nanopi-r4s.dts | 79 +++++++++--------------------- 1 file changed, 23 insertions(+), 56 deletions(-)
diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..e341e498cd 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,51 +17,23 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";
- aliases { - ethernet1 = &r8169; + chosen { + stdout-path = "serial2:1500000n8"; };
- vdd_5v: vdd-5v { + vcc5v0_core: vcc5v0-core { compatible = "regulator-fixed"; - regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; + regulator-name = "vcc5v0_core"; + vin-supply = <&vdd_5v>; };
- fan: pwm-fan { - compatible = "pwm-fan"; - cooling-levels = <0 12 18 255>; - #cooling-cells = <2>; - fan-supply = <&vdd_5v>; - pwms = <&pwm1 0 50000 0>; - }; -}; - -&cpu_thermal { - trips { - cpu_warm: cpu_warm { - temperature = <55000>; - hysteresis = <2000>; - type = "active"; - }; - - cpu_hot: cpu_hot { - temperature = <65000>; - hysteresis = <2000>; - type = "active"; - }; - }; - - cooling-maps { - map2 { - trip = <&cpu_warm>; - cooling-device = <&fan THERMAL_NO_LIMIT 1>; - }; - - map3 { - trip = <&cpu_hot>; - cooling-device = <&fan 2 THERMAL_NO_LIMIT>; - }; + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-name = "vdd_5v"; }; };
@@ -76,37 +48,32 @@ &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 { @@ -122,11 +89,11 @@ };
&u2phy0_host { - phy-supply = <&vdd_5v>; + phy-supply = <&vcc5v0_core>; };
&u2phy1_host { - status = "disabled"; + phy-supply = <&vcc5v0_core>; };
&usbdrd_dwc3_0 { @@ -134,5 +101,5 @@ };
&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc5v0_core>; };