From af0a4aa4a4a3b1cf38bc154b340a40801c5cb5a6 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 13 Dec 2024 21:21:18 +0800 Subject: [PATCH] rockchip: update rk3399 soc support --- target/linux/rockchip/Makefile | 2 +- .../boot/dts/rockchip/rk3399-fine-3399.dts | 2 +- target/linux/rockchip/image/armv8.mk | 55 +++++++++---------- ...chip-rk3399-overclock-to-2.2-1.8-GHz.patch | 8 +-- ...chip-rk3399-overclock-to-2.2-1.8-GHz.patch | 8 +-- ...chip-rk3399-overclock-to-2.2-1.8-GHz.patch | 8 +-- 6 files changed, 40 insertions(+), 43 deletions(-) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index 2160442f770acd..c3d46c278e2845 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -16,7 +16,7 @@ endef include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \ +DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-button-hotplug \ automount autocore-arm e2fsprogs ethtool haveged htop usb-modeswitch KERNELNAME:=Image dtbs 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 e02460479a202a..3e9105d006ef2c 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 @@ -5,7 +5,7 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-op1-opp.dtsi" +#include "rk3399-opp.dtsi" / { model = "RUMU3F Fine3399"; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 830e77d10a688a..13648ab7723f17 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -80,7 +80,7 @@ define Device/dilusense_dlfr100 SOC := rk3399 UBOOT_DEVICE_NAME := dlfr100-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += dilusense_dlfr100 @@ -108,7 +108,7 @@ define Device/fastrhino_common DEVICE_VENDOR := FastRhino SOC := rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125-rss endef define Device/fastrhino_r66s @@ -160,7 +160,7 @@ define Device/friendlyarm_nanopi-r2c SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2c-rk3328 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-usb-net-rtl8152 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 endef TARGET_DEVICES += friendlyarm_nanopi-r2c @@ -170,7 +170,7 @@ define Device/friendlyarm_nanopi-r2c-plus SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2c-plus-rk3328 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-usb-net-rtl8152 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 endef TARGET_DEVICES += friendlyarm_nanopi-r2c-plus @@ -180,7 +180,7 @@ define Device/friendlyarm_nanopi-r2s SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-usb-net-rtl8152 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 endef TARGET_DEVICES += friendlyarm_nanopi-r2s @@ -190,7 +190,7 @@ define Device/friendlyarm_nanopi-r2s-plus SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2s-plus-rk3328 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-usb-net-rtl8152 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 endef TARGET_DEVICES += friendlyarm_nanopi-r2s-plus @@ -200,7 +200,7 @@ define Device/friendlyarm_nanopi-r3s SOC := rk3566 UBOOT_DEVICE_NAME := nanopi-r3s-rk3566 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += friendlyarm_nanopi-r3s @@ -210,7 +210,7 @@ define Device/friendlyarm_nanopi-r4s SOC := rk3399 UBOOT_DEVICE_NAME := nanopi-r4s-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += friendlyarm_nanopi-r4s @@ -220,7 +220,7 @@ define Device/friendlyarm_nanopi-r4se SOC := rk3399 UBOOT_DEVICE_NAME := nanopi-r4se-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += friendlyarm_nanopi-r4se @@ -230,7 +230,7 @@ define Device/friendlyarm_nanopi-r5c SOC := rk3568 UBOOT_DEVICE_NAME := nanopi-r5c-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125-rss endef TARGET_DEVICES += friendlyarm_nanopi-r5c @@ -240,7 +240,7 @@ define Device/friendlyarm_nanopi-r5s SOC := rk3568 UBOOT_DEVICE_NAME := nanopi-r5s-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125-rss endef TARGET_DEVICES += friendlyarm_nanopi-r5s @@ -250,7 +250,7 @@ define Device/friendlyarm_nanopi-r6c SOC := rk3588s UBOOT_DEVICE_NAME := nanopi-r6c-rk3588s IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125-rss endef TARGET_DEVICES += friendlyarm_nanopi-r6c @@ -260,7 +260,7 @@ define Device/friendlyarm_nanopi-r6s SOC := rk3588s UBOOT_DEVICE_NAME := nanopi-r6s-rk3588s IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125-rss endef TARGET_DEVICES += friendlyarm_nanopi-r6s @@ -339,7 +339,7 @@ define Device/lyt_t68m SOC := rk3568 UBOOT_DEVICE_NAME := generic-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script vop | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-drm-rockchip kmod-mt7921e kmod-r8125-rss wpad-openssl uboot-envtools + DEVICE_PACKAGES := kmod-drm-rockchip kmod-gpio-button-hotplug kmod-r8125-rss uboot-envtools endef TARGET_DEVICES += lyt_t68m @@ -350,7 +350,7 @@ define Device/mmbox_anas3035 DEVICE_DTS := rockchip/rk3568-mmbox-anas3035 UBOOT_DEVICE_NAME := mmbox-anas3035-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125-rss kmod-ata-ahci-dwc kmod-hwmon-pwmfan kmod-hwmon-drivetemp + DEVICE_PACKAGES := kmod-ata-ahci-dwc kmod-hwmon-drivetemp kmod-hwmon-pwmfan kmod-r8125-rss endef TARGET_DEVICES += mmbox_anas3035 @@ -370,7 +370,6 @@ define Device/pine64_rockpro64 SOC := rk3399 UBOOT_DEVICE_NAME := rockpro64-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := -urngd endef TARGET_DEVICES += pine64_rockpro64 @@ -380,7 +379,7 @@ define Device/radxa_e20c DEVICE_DTS := rockchip/rk3528-radxa-e20c UBOOT_DEVICE_NAME := evb-rk3528 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3528 | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 -urngd endef TARGET_DEVICES += radxa_e20c @@ -414,16 +413,14 @@ define Device/radxa_rock-3c endef TARGET_DEVICES += radxa_rock-3c -define Device/radxa_rock-pi-4 +define Device/radxa_rock-pi-4a DEVICE_VENDOR := Radxa - DEVICE_MODEL := ROCK Pi 4 + DEVICE_MODEL := ROCK Pi 4A SOC := rk3399 - SUPPORTED_DEVICES := radxa,rockpi4 + SUPPORTED_DEVICES := radxa,rockpi4a radxa,rockpi4 UBOOT_DEVICE_NAME := rock-pi-4-rk3399 - IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := -urngd endef -TARGET_DEVICES += radxa_rock-pi-4 +TARGET_DEVICES += radxa_rock-pi-4a define Device/radxa_rock-5a DEVICE_VENDOR := Radxa @@ -441,7 +438,7 @@ define Device/rongpin_king3399 SOC := rk3399 UBOOT_DEVICE_NAME := king3399-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd kmod-brcmfmac cypress-firmware-4356-sdio wpad-openssl + DEVICE_PACKAGES := kmod-r8168 kmod-brcmfmac cypress-firmware-4356-sdio wpad-openssl endef TARGET_DEVICES += rongpin_king3399 @@ -451,7 +448,7 @@ define Device/rocktech_mpc1903 SOC := rk3399 UBOOT_DEVICE_NAME := mpc1903-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-usb-net-smsc75xx kmod-usb-serial-cp210x -urngd + DEVICE_PACKAGES := kmod-usb-net-smsc75xx kmod-usb-serial-cp210x endef TARGET_DEVICES += rocktech_mpc1903 @@ -461,7 +458,7 @@ 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-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += rumu3f_fine-3399 @@ -472,7 +469,7 @@ define Device/scensmart_sv901-eaio UBOOT_DEVICE_NAME := sv901-eaio-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := brcmfmac-nvram-4356-sdio cypress-firmware-4356-sdio kmod-brcmfmac \ - kmod-switch-rtl8367b swconfig wpad -urngd + kmod-gpio-button-hotplug kmod-switch-rtl8367b swconfig wpad endef TARGET_DEVICES += scensmart_sv901-eaio @@ -509,7 +506,7 @@ define Device/sharevdi_h3399pc SOC := rk3399 UBOOT_DEVICE_NAME := h3399pc-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += sharevdi_h3399pc @@ -519,7 +516,7 @@ define Device/sharevdi_guangmiao-g4c SOC := rk3399 UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 -urngd + DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 endef TARGET_DEVICES += sharevdi_guangmiao-g4c diff --git a/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch b/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch index 9090e96dcec1ac..c3989d977c4eff 100644 --- a/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch +++ b/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch @@ -20,11 +20,11 @@ Signed-off-by: Tianling Shen }; + opp06 { + opp-hz = /bits/ 64 <1608000000>; -+ opp-microvolt = <1225000>; ++ opp-microvolt = <1225000 1225000 1250000>; + }; + opp07 { + opp-hz = /bits/ 64 <1800000000>; -+ opp-microvolt = <1275000>; ++ opp-microvolt = <1275000 1275000 1275000>; + }; }; @@ -35,11 +35,11 @@ Signed-off-by: Tianling Shen }; + opp08 { + opp-hz = /bits/ 64 <2016000000>; -+ opp-microvolt = <1250000>; ++ opp-microvolt = <1250000 1250000 1250000>; + }; + opp09 { + opp-hz = /bits/ 64 <2208000000>; -+ opp-microvolt = <1325000>; ++ opp-microvolt = <1325000 1325000 1325000>; + }; }; diff --git a/target/linux/rockchip/patches-6.1/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch b/target/linux/rockchip/patches-6.1/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch index ee8527a2fca124..ba96cb4ae158fd 100644 --- a/target/linux/rockchip/patches-6.1/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch +++ b/target/linux/rockchip/patches-6.1/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch @@ -20,11 +20,11 @@ Signed-off-by: Tianling Shen }; + opp06 { + opp-hz = /bits/ 64 <1608000000>; -+ opp-microvolt = <1225000>; ++ opp-microvolt = <1225000 1225000 1250000>; + }; + opp07 { + opp-hz = /bits/ 64 <1800000000>; -+ opp-microvolt = <1275000>; ++ opp-microvolt = <1275000 1275000 1275000>; + }; }; @@ -35,11 +35,11 @@ Signed-off-by: Tianling Shen }; + opp08 { + opp-hz = /bits/ 64 <2016000000>; -+ opp-microvolt = <1250000>; ++ opp-microvolt = <1250000 1250000 1250000>; + }; + opp09 { + opp-hz = /bits/ 64 <2208000000>; -+ opp-microvolt = <1325000>; ++ opp-microvolt = <1325000 1325000 1325000>; + }; }; diff --git a/target/linux/rockchip/patches-6.6/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch b/target/linux/rockchip/patches-6.6/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch index ee8527a2fca124..ba96cb4ae158fd 100644 --- a/target/linux/rockchip/patches-6.6/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch +++ b/target/linux/rockchip/patches-6.6/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch @@ -20,11 +20,11 @@ Signed-off-by: Tianling Shen }; + opp06 { + opp-hz = /bits/ 64 <1608000000>; -+ opp-microvolt = <1225000>; ++ opp-microvolt = <1225000 1225000 1250000>; + }; + opp07 { + opp-hz = /bits/ 64 <1800000000>; -+ opp-microvolt = <1275000>; ++ opp-microvolt = <1275000 1275000 1275000>; + }; }; @@ -35,11 +35,11 @@ Signed-off-by: Tianling Shen }; + opp08 { + opp-hz = /bits/ 64 <2016000000>; -+ opp-microvolt = <1250000>; ++ opp-microvolt = <1250000 1250000 1250000>; + }; + opp09 { + opp-hz = /bits/ 64 <2208000000>; -+ opp-microvolt = <1325000>; ++ opp-microvolt = <1325000 1325000 1325000>; + }; };