enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi-5.15: adapting patches for the version 5.15.43 (#3827)

Browse Source 
* sunxi-5.15: adapting patches for the version 5.15.43

* fix: cpu opp table sun8i-a83t
This commit is contained in:
The-going 2022-05-27 21:17:58 +03:00 committed by GitHub
parent 351303bc7a
commit 082234b497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 122 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/sunxi64_common.inc
View File

@ -18,7 +18,7 @@ case $BRANCH in
current)
KERNEL_VERSION_LEVEL="5.15"
KERNELSWITCHOBJ="tag=v5.15.35"
KERNELSWITCHOBJ="tag=v5.15.43"
;;
edge)

2
config/sources/families/include/sunxi_common.inc
View File

@ -18,7 +18,7 @@ case $BRANCH in
;;
current)
KERNEL_VERSION_LEVEL="5.15"
KERNELSWITCHOBJ="tag=v5.15.35"
KERNELSWITCHOBJ="tag=v5.15.43"
;;
edge)
KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.17}

4
patch/kernel/archive/sunxi-5.15/megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debu.patch
View File

@ -16,8 +16,8 @@ diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpu
index 2deed8d87..d1a77eb1e 100644
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
@@ -102,6 +102,7 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev)
return ret;
@@ -104,6 +104,7 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev)
}
snprintf(name, MAX_NAME_LEN, "speed%d", speed);
+ pr_info("Using CPU speed bin %s\n", name);

115
patch/kernel/archive/sunxi-5.15/patches.armbian/fix-cpu-opp-table-sun8i-a83t.patch Normal file
View File

@ -0,0 +1,115 @@
From 91fd8b82e2223a55ab739a6b5d34fba3bbde0182 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Fri, 27 May 2022 14:45:59 +0300
Subject: [PATCH] fix: cpu opp table sun8i-a83t
cpu opp table can only be a multiple of the integer 24 * 8 * n
---
arch/arm/boot/dts/sun8i-a83t.dtsi | 52 +++++++++++++++++++------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index f0711d68b..4fad00e0e 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -224,32 +224,38 @@ cpu0_opp_table: opp-table-cluster0 {
compatible = "operating-points-v2";
opp-shared;
- opp-480000000 {
- opp-hz = /bits/ 64 <480000000>;
+ opp-576000000 {
+ opp-hz = /bits/ 64 <576000000>; /* 24x8x3 */
opp-microvolt = <840000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1008000000 {
- opp-hz = /bits/ 64 <1008000000>;
+ opp-768000000 {
+ opp-hz = /bits/ 64 <768000000>; /* 24x8x4 */
opp-microvolt = <840000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1412000000 {
- opp-hz = /bits/ 64 <1412000000>;
+ opp-1152000000 {
+ opp-hz = /bits/ 64 <1152000000>; /* 24x8x6 */
+ opp-microvolt = <900000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-1344000000 {
+ opp-hz = /bits/ 64 <1344000000>; /* 24x8x7 */
opp-microvolt = <920000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1608000000 {
- opp-hz = /bits/ 64 <1608000000>;
+ opp-1536000000 {
+ opp-hz = /bits/ 64 <1536000000>; /* 24x8x8 */
opp-microvolt = <1000000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1800000000 {
- opp-hz = /bits/ 64 <1800000000>;
+ opp-1728000000 {
+ opp-hz = /bits/ 64 <1728000000>; /* 24x8x9 */
opp-microvolt = <1080000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
@@ -259,32 +265,38 @@ cpu1_opp_table: opp-table-cluster1 {
compatible = "operating-points-v2";
opp-shared;
- opp-480000000 {
- opp-hz = /bits/ 64 <480000000>;
+ opp-576000000 {
+ opp-hz = /bits/ 64 <576000000>; /* 24x8x3 */
opp-microvolt = <840000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1008000000 {
- opp-hz = /bits/ 64 <1008000000>;
+ opp-768000000 {
+ opp-hz = /bits/ 64 <768000000>; /* 24x8x4 */
opp-microvolt = <840000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1412000000 {
- opp-hz = /bits/ 64 <1412000000>;
+ opp-1152000000 {
+ opp-hz = /bits/ 64 <1152000000>; /* 24x8x6 */
+ opp-microvolt = <900000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-1344000000 {
+ opp-hz = /bits/ 64 <1344000000>; /* 24x8x7 */
opp-microvolt = <920000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1608000000 {
- opp-hz = /bits/ 64 <1608000000>;
+ opp-1536000000 {
+ opp-hz = /bits/ 64 <1536000000>; /* 24x8x8 */
opp-microvolt = <1000000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
- opp-1800000000 {
- opp-hz = /bits/ 64 <1800000000>;
+ opp-1728000000 {
+ opp-hz = /bits/ 64 <1728000000>; /* 24x8x9 */
opp-microvolt = <1080000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
--
2.35.3

1
patch/kernel/archive/sunxi-5.15/series.armbian
View File

@ -182,6 +182,7 @@
patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-rtl8723cs.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch
patches.armbian/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch
patches.armbian/fix-cpu-opp-table-sun8i-a83t.patch
patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch
patches.armbian/0002-compile-the-pwm-overlay.patch

3
patch/kernel/archive/sunxi-5.15/series.conf
View File

@ -484,7 +484,7 @@
patches.armbian/drv-mfd-Add-support-for-AC200.patch
patches.armbian/drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode.patch
patches.armbian/drv-net-phy-Add-support-for-AC200-EPHY.patch
patches.armbian/drv-rtc-sun6i-Fix-time-overflow-handling.patch
- patches.armbian/drv-rtc-sun6i-Fix-time-overflow-handling.patch
patches.armbian/drv-rtc-sun6i-Add-support-linear-day-storage.patch
patches.armbian/drv-rtc-sun6i-Add-support-for-broken-down-alarm-regi.patch
patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch
@ -658,6 +658,7 @@
patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-rtl8723cs.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch
patches.armbian/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch
patches.armbian/fix-cpu-opp-table-sun8i-a83t.patch
patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch
patches.armbian/0002-compile-the-pwm-overlay.patch