diff --git a/package/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch b/package/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch index d4ff19239..1efa4905b 100644 --- a/package/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch +++ b/package/boot/uboot-rockchip/patches/302-rockchip-rk3399-Add-support-for-rumu3f-fine3399.patch @@ -17,7 +17,7 @@ +}; --- /dev/null +++ b/arch/arm/dts/rk3399-fine-3399.dts -@@ -0,0 +1,789 @@ +@@ -0,0 +1,799 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; @@ -120,7 +120,7 @@ + vin-supply = <&vcc_sys>; + }; + -+ leds: gpio-leds { ++ gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&user_led2>; @@ -149,7 +149,7 @@ + + fan0: pwm-fan { + compatible = "pwm-fan"; -+ cooling-levels = <0 25 50 75 100 150>; ++ cooling-levels = <0 30 60 90 120 160>; + #cooling-cells = <2>; + fan-supply = <&vcc_sys>; + pwms = <&pwm1 0 40000 0>; @@ -215,18 +215,28 @@ + +&cpu_thermal { + trips { ++ cpu_warm: cpu_warm { ++ temperature = <50000>; ++ hysteresis = <2000>; ++ type = "active"; ++ }; ++ + cpu_hot: cpu_hot { -+ hysteresis = <10000>; -+ temperature = <55000>; ++ temperature = <65000>; ++ hysteresis = <2000>; + type = "active"; + }; + }; + + cooling-maps { + map2 { -+ cooling-device = -+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; ++ trip = <&cpu_warm>; ++ cooling-device = <&fan0 THERMAL_NO_LIMIT 1>; ++ }; ++ ++ map3 { + trip = <&cpu_hot>; ++ cooling-device = <&fan0 4 THERMAL_NO_LIMIT>; + }; + }; +}; @@ -675,7 +685,7 @@ + status = "okay"; + + panel@0 { -+ compatible = "sitronix,st7735s", "sitronix,st7735r", "sitronix,st7789v", "jianda,jd-t18003-t01"; ++ compatible = "jianda,jd-t18003-t01"; + reg = <0>; + rgb; + width = <80>; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-fine-3399.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-fine-3399.dts index 3e9105d00..359f543fd 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-fine-3399.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-fine-3399.dts @@ -9,7 +9,7 @@ / { model = "RUMU3F Fine3399"; - compatible = "rumu3f,fine-3399","rockchip,rk3399"; + compatible = "rumu3f,fine-3399", "rockchip,rk3399"; aliases { ethernet0 = &gmac; @@ -100,7 +100,7 @@ vin-supply = <&vcc_sys>; }; - leds: gpio-leds { + gpio-leds { compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&user_led2>; @@ -127,9 +127,9 @@ }; }; - fan0: pwm-fan { + fan: pwm-fan { compatible = "pwm-fan"; - cooling-levels = <0 25 50 75 100 150>; + cooling-levels = <0 30 60 90 120 160>; #cooling-cells = <2>; fan-supply = <&vcc_sys>; pwms = <&pwm1 0 40000 0>; @@ -195,18 +195,28 @@ &cpu_thermal { trips { + cpu_warm: cpu_warm { + temperature = <50000>; + hysteresis = <2000>; + type = "active"; + }; + cpu_hot: cpu_hot { - hysteresis = <10000>; - temperature = <55000>; + temperature = <65000>; + hysteresis = <2000>; type = "active"; }; }; cooling-maps { map2 { - cooling-device = - <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + trip = <&cpu_warm>; + cooling-device = <&fan THERMAL_NO_LIMIT 1>; + }; + + map3 { trip = <&cpu_hot>; + cooling-device = <&fan 4 THERMAL_NO_LIMIT>; }; }; }; @@ -656,7 +666,7 @@ status = "okay"; panel@0 { - compatible = "sitronix,st7735s", "sitronix,st7735r", "sitronix,st7789v", "jianda,jd-t18003-t01"; + compatible = "jianda,jd-t18003-t01"; reg = <0>; rgb; width = <80>; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 3c34c5f37..7f61964e9 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -458,7 +458,8 @@ define Device/rumu3f_fine-3399 SOC := rk3399 UBOOT_DEVICE_NAME := fine3399-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 + DEVICE_PACKAGES := brcmfmac-firmware-43430b0-sdio brcmfmac-nvram-43430b0-sdio \ + kmod-brcmfmac kmod-gpio-button-hotplug kmod-usb-net-rtl8152 wpad endef TARGET_DEVICES += rumu3f_fine-3399