From d7cc37423587ba857685cdc44376e2efe8b8e27a Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Fri, 7 Aug 2020 10:06:24 +0200
Subject: [PATCH] Fixed setting CPUMAX in rockchip64 / rk3399 families (#2134)

Additionally enabled possibility to override default values for CPUMIN and CPUMAX per board.
---
 config/boards/nanopi-r2s.conf                    |  1 -
 config/boards/nanopineo3.wip                     |  1 -
 config/boards/renegade.conf                      |  1 -
 config/boards/rock64.conf                        |  1 -
 config/boards/rockpi-e.conf                      |  1 -
 config/boards/z28pro.tvb                         |  1 -
 .../families/include/rockchip64_common.inc       | 16 ++++++++++++----
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/boards/nanopi-r2s.conf b/config/boards/nanopi-r2s.conf
index 99bca096a3..1186b7b5ca 100644
--- a/config/boards/nanopi-r2s.conf
+++ b/config/boards/nanopi-r2s.conf
@@ -9,4 +9,3 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
 SERIALCON="ttyS2:1500000,ttyGS0"
 BUILD_DESKTOP="no"
 BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"
-CPUMAX="1296000"
diff --git a/config/boards/nanopineo3.wip b/config/boards/nanopineo3.wip
index a7aff75fb3..5089a04fde 100644
--- a/config/boards/nanopineo3.wip
+++ b/config/boards/nanopineo3.wip
@@ -9,4 +9,3 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
 SERIALCON="ttyS2:1500000,ttyGS0"
 BUILD_DESKTOP="no"
 BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"
-CPUMAX="1296000"
diff --git a/config/boards/renegade.conf b/config/boards/renegade.conf
index 7417264a75..fbc2716d3d 100644
--- a/config/boards/renegade.conf
+++ b/config/boards/renegade.conf
@@ -4,4 +4,3 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="roc-rk3328-cc_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
-CPUMAX="1296000"
diff --git a/config/boards/rock64.conf b/config/boards/rock64.conf
index b156935662..15ed251872 100644
--- a/config/boards/rock64.conf
+++ b/config/boards/rock64.conf
@@ -4,4 +4,3 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="rock64-rk3328_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
-CPUMAX="1296000"
diff --git a/config/boards/rockpi-e.conf b/config/boards/rockpi-e.conf
index 7b3a9dc75c..9104098f05 100644
--- a/config/boards/rockpi-e.conf
+++ b/config/boards/rockpi-e.conf
@@ -6,4 +6,3 @@ KERNEL_TARGET="current,dev"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
 BUILD_DESKTOP="no"
-CPUMAX="1296000"
diff --git a/config/boards/z28pro.tvb b/config/boards/z28pro.tvb
index 8d5c08af10..504ff3e9f5 100644
--- a/config/boards/z28pro.tvb
+++ b/config/boards/z28pro.tvb
@@ -5,5 +5,4 @@ BOOTCONFIG="rock64-rk3328_defconfig"
 BOOT_FDT_FILE="rockchip/rk3328-z28pro.dtb"
 KERNEL_TARGET="legacy,current"
 FULL_DESKTOP="yes"
-CPUMAX="1296000"
 BOOT_LOGO="desktop"
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index 764162a457..bf98ed5a23 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -8,12 +8,22 @@ BOOTDELAY=0
 OVERLAY_PREFIX='rockchip'
 SERIALCON=${SERIALCON:=$([ $BRANCH == "legacy" ] && echo "ttyFIQ0:1500000" || echo "ttyS2:1500000")}
 GOVERNOR="ondemand"
-CPUMAX="2016000"
-CPUMIN="408000"
 BOOTBRANCH="tag:v2020.07"
 
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
 
+if [[ $BOOTCONFIG == *3399* ]]; then
+
+	CPUMIN=${CPUMIN:="408000"}
+	CPUMAX=${CPUMAX:="2016000"}
+
+else # rk3308, rk3328
+
+	CPUMIN=${CPUMIN:="408000"}
+	CPUMAX=${CPUMAX:="1296000"}
+
+fi
+
 if [[ $BOARD == nanopi-r2s || $BOARD == rockpi-e || $BOARD == nanopineo3 ]]; then
 
 	BOOT_USE_BLOBS=yes
@@ -25,7 +35,6 @@ if [[ $BOARD == nanopi-r2s || $BOARD == rockpi-e || $BOARD == nanopineo3 ]]; the
 elif [[ $BOOTCONFIG == *3328* ]]; then
 
 	BOOT_RK3328_USE_AYUFAN_ATF=yes
-	CPUMAX="1390000"
 
 elif [[ $BOARD == rockpi-4* ]]; then
 
@@ -47,7 +56,6 @@ elif [[ $BOARD == rockpi-s ]]; then
 	DDR_BLOB='rk33/rk3308_ddr_589MHz_uart0_m0_v1.26.bin'
 	MINILOADER_BLOB='rk33/rk3308_miniloader_sd_nand_v1.13.bin'
 	BL31_BLOB='rk33/rk3308_bl31_v2.10.elf'
-	CPUMAX="1296000"
 
 else