arm64: rk3399: Optimize performance and cleanup
PATCH 1/1 arm64: rk3399: Optimize performance and cleanup
Signed-off-by Xiaobo Tian <[email protected]>
--- arch/arm/dts/rk3399-nanopi-r4s.dts | 40 +++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-)
arch/arm/dts/rk3399-nanopi-r4s.dts +12 -28
@@ -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";
@@ -30,6 +26,10 @@ 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 +73,32 @@ 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"; }; 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>, + <1 RK_PA0 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 {
@@ -117,10 +109,6 @@ status = "disabled"; }; -&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; };
@@ -132,7 +120,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -};
Signature · 1 line
2.32.0
I'm not sure what performance optimisation is being done here?
Also we generally sync the rockchip device trees from the Linux kernel so when that next happens if these aren't upstream in Linux they'll likely be lost.
Peter
Quoted 103 lines · Xiaobo Tian
Signed-off-by Xiaobo Tian <[email protected]>--- arch/arm/dts/rk3399-nanopi-r4s.dts | 40 +++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-)arch/arm/dts/rk3399-nanopi-r4s.dts +12
-29@@ -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";@@ -30,6 +26,10 @@ 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 +73,32 @@ 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"; }; 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>, + <1 RK_PA0 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 {@@ -117,10 +109,6 @@ status = "disabled"; }; -&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; };@@ -132,7 +120,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -}; --2.32.0