mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
306 lines
9.2 KiB
Diff
306 lines
9.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AGM1968 <AGM1968@users.noreply.github.com>
|
|
Date: Tue, 23 May 2023 16:43:00 +0000
|
|
Subject: arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2
|
|
arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
|
|
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
|
|
drivers/cpufreq/cpufreq-dt-platdev.c drivers/cpufreq/sun50i-cpufreq-nvmem.c
|
|
|
|
Signed-off-by: AGM1968 <AGM1968@users.noreply.github.com>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 75 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 6 +
|
|
drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
|
|
drivers/cpufreq/sun50i-cpufreq-nvmem.c | 91 +++++++---
|
|
4 files changed, 149 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
|
|
new file mode 100644
|
|
index 000000000000..36f2950367c6
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
|
|
@@ -0,0 +1,75 @@
|
|
+//SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+//Testing Version 1 from: AGM1968 <AGM1968@users.noreply.github.com>
|
|
+//Noted: PLL_CPUX = 24 MHz*N/P (WIP)
|
|
+
|
|
+/ {
|
|
+ cpu_opp_table: opp-table-cpu {
|
|
+ compatible = "allwinner,sun50i-h616-operating-points";
|
|
+ nvmem-cells = <&cpu_speed_grade>;
|
|
+ opp-shared;
|
|
+
|
|
+ opp-480000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <480000000>;
|
|
+ opp-microvolt-speed0 = <820000 820000 1100000>;
|
|
+ opp-microvolt-speed1 = <880000 880000 1100000>;
|
|
+ opp-microvolt-speed2 = <880000 880000 1100000>;
|
|
+ };
|
|
+
|
|
+ opp-600000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <600000000>;
|
|
+ opp-microvolt-speed0 = <820000 820000 1100000>;
|
|
+ opp-microvolt-speed1 = <880000 880000 1100000>;
|
|
+ opp-microvolt-speed2 = <880000 880000 1100000>;
|
|
+ };
|
|
+
|
|
+ opp-792000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <792000000>;
|
|
+ opp-microvolt-speed0 = <860000 860000 1100000>;
|
|
+ opp-microvolt-speed1 = <940000 940000 1100000>;
|
|
+ opp-microvolt-speed2 = <940000 940000 1100000>;
|
|
+ };
|
|
+
|
|
+ opp-1008000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <1008000000>;
|
|
+ opp-microvolt-speed0 = <900000 900000 1100000>;
|
|
+ opp-microvolt-speed1 = <1020000 1020000 1100000>;
|
|
+ opp-microvolt-speed2 = <1020000 1020000 1100000>;
|
|
+ };
|
|
+
|
|
+ opp-1200000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <1200000000>;
|
|
+ opp-microvolt-speed0 = <960000 960000 1100000>;
|
|
+ opp-microvolt-speed1 = <1100000 1100000 1100000>;
|
|
+ opp-microvolt-speed2 = <1100000 1100000 1100000>;
|
|
+ };
|
|
+
|
|
+ opp-1512000000 {
|
|
+ clock-latency-ns = <244144>; /* 8 32k periods */
|
|
+ opp-hz = /bits/ 64 <1512000000>;
|
|
+ opp-microvolt-speed0 = <1100000 1100000 1100000>;
|
|
+ opp-microvolt-speed1 = <1100000 1100000 1100000>;
|
|
+ opp-microvolt-speed2 = <1100000 1100000 1100000>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&cpu0 {
|
|
+ operating-points-v2 = <&cpu_opp_table>;
|
|
+};
|
|
+
|
|
+&cpu1 {
|
|
+ operating-points-v2 = <&cpu_opp_table>;
|
|
+};
|
|
+
|
|
+&cpu2 {
|
|
+ operating-points-v2 = <&cpu_opp_table>;
|
|
+};
|
|
+
|
|
+&cpu3 {
|
|
+ operating-points-v2 = <&cpu_opp_table>;
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
|
|
index 8d8009c7f9a3..28b5b1be932f 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
|
|
@@ -6,12 +6,18 @@
|
|
/dts-v1/;
|
|
|
|
#include "sun50i-h616-orangepi-zero.dtsi"
|
|
+#include "sun50i-h616-cpu-opp.dtsi"
|
|
|
|
/ {
|
|
model = "OrangePi Zero2";
|
|
compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616";
|
|
};
|
|
|
|
+&cpu0 {
|
|
+ cpu-supply = <®_dcdca>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&emac0 {
|
|
phy-supply = <®_dcdce>;
|
|
};
|
|
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
index fb2875ce1fdd..e63d36839769 100644
|
|
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
|
|
@@ -104,6 +104,7 @@ static const struct of_device_id allowlist[] __initconst = {
|
|
*/
|
|
static const struct of_device_id blocklist[] __initconst = {
|
|
{ .compatible = "allwinner,sun50i-h6", },
|
|
+ { .compatible = "allwinner,sun50i-h616", },
|
|
|
|
{ .compatible = "apple,arm-platform", },
|
|
|
|
diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
|
|
index 6845ab5034ec..5d85bfe475de 100644
|
|
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
|
|
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
|
|
@@ -6,6 +6,9 @@
|
|
* provide the OPP framework with required information.
|
|
*
|
|
* Copyright (C) 2019 Yangtao Li <tiny.windzz@gmail.com>
|
|
+ *
|
|
+ * ADD efuse_xlate to extract SoC version so that h6 and h616 can coexist.
|
|
+ * Version 1 AGM1968 <AGM1968@users.noreply.github.com>
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
@@ -20,25 +23,62 @@
|
|
|
|
#define MAX_NAME_LEN 7
|
|
|
|
-#define NVMEM_MASK 0x7
|
|
-#define NVMEM_SHIFT 5
|
|
+#define SUN50I_H616_NVMEM_MASK 0x22
|
|
+#define SUN50I_H616_NVMEM_SHIFT 5
|
|
+#define SUN50I_H6_NVMEM_MASK 0x7
|
|
+#define SUN50I_H6_NVMEM_SHIFT 5
|
|
+
|
|
+struct sunxi_cpufreq_soc_data {
|
|
+ u32 (*efuse_xlate) (void *efuse);
|
|
+};
|
|
|
|
static struct platform_device *cpufreq_dt_pdev, *sun50i_cpufreq_pdev;
|
|
|
|
+static u32 sun50i_h616_efuse_xlate(void *efuse)
|
|
+{
|
|
+ u32 efuse_value = (*(u32 *)efuse >> SUN50I_H616_NVMEM_SHIFT) &
|
|
+ SUN50I_H616_NVMEM_MASK;
|
|
+
|
|
+ /* Tested as V1 h616 soc. Expected efuse values are 1 - 3,
|
|
+ slowest to fastest */
|
|
+ if (efuse_value >=1 && efuse_value <= 3)
|
|
+ return efuse_value - 1;
|
|
+ else
|
|
+ return 0;
|
|
+};
|
|
+
|
|
+static u32 sun50i_h6_efuse_xlate(void *efuse)
|
|
+{
|
|
+ u32 efuse_value = (*(u32 *)efuse >> SUN50I_H6_NVMEM_SHIFT) &
|
|
+ SUN50I_H6_NVMEM_MASK;
|
|
+
|
|
+ /*
|
|
+ * We treat unexpected efuse values as if the SoC was from
|
|
+ * the slowest bin. Expected efuse values are 1 - 3, slowest
|
|
+ * to fastest.
|
|
+ */
|
|
+ if (efuse_value >= 1 && efuse_value <= 3)
|
|
+ return efuse_value - 1;
|
|
+ else
|
|
+ return 0;
|
|
+};
|
|
+
|
|
+
|
|
/**
|
|
* sun50i_cpufreq_get_efuse() - Determine speed grade from efuse value
|
|
+ * @soc_data: pointer to sunxi_cpufreq_soc_data context
|
|
* @versions: Set to the value parsed from efuse
|
|
*
|
|
* Returns 0 if success.
|
|
*/
|
|
-static int sun50i_cpufreq_get_efuse(u32 *versions)
|
|
+static int sun50i_cpufreq_get_efuse(const struct sunxi_cpufreq_soc_data *soc_data,
|
|
+ u32 *versions)
|
|
{
|
|
struct nvmem_cell *speedbin_nvmem;
|
|
struct device_node *np;
|
|
struct device *cpu_dev;
|
|
- u32 *speedbin, efuse_value;
|
|
+ u32 *speedbin;
|
|
size_t len;
|
|
- int ret;
|
|
|
|
cpu_dev = get_cpu_device(0);
|
|
if (!cpu_dev)
|
|
@@ -47,10 +87,9 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
|
|
np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
|
|
if (!np)
|
|
return -ENOENT;
|
|
-
|
|
- ret = of_device_is_compatible(np,
|
|
- "allwinner,sun50i-h6-operating-points");
|
|
- if (!ret) {
|
|
+ if (of_device_is_compatible(np, "allwinner,sun50i-h6-operating-points")) {}
|
|
+ else if (of_device_is_compatible(np, "allwinner,sun50i-h616-operating-points")) {}
|
|
+ else {
|
|
of_node_put(np);
|
|
return -ENOENT;
|
|
}
|
|
@@ -66,17 +105,7 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
|
|
if (IS_ERR(speedbin))
|
|
return PTR_ERR(speedbin);
|
|
|
|
- efuse_value = (*speedbin >> NVMEM_SHIFT) & NVMEM_MASK;
|
|
-
|
|
- /*
|
|
- * We treat unexpected efuse values as if the SoC was from
|
|
- * the slowest bin. Expected efuse values are 1-3, slowest
|
|
- * to fastest.
|
|
- */
|
|
- if (efuse_value >= 1 && efuse_value <= 3)
|
|
- *versions = efuse_value - 1;
|
|
- else
|
|
- *versions = 0;
|
|
+ *versions = soc_data->efuse_xlate(speedbin);
|
|
|
|
kfree(speedbin);
|
|
return 0;
|
|
@@ -84,18 +113,23 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
|
|
|
|
static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev)
|
|
{
|
|
+ const struct of_device_id *match;
|
|
int *opp_tokens;
|
|
char name[MAX_NAME_LEN];
|
|
unsigned int cpu;
|
|
u32 speed = 0;
|
|
int ret;
|
|
|
|
+ match = dev_get_platdata(&pdev->dev);
|
|
+ if (!match)
|
|
+ return -EINVAL;
|
|
+
|
|
opp_tokens = kcalloc(num_possible_cpus(), sizeof(*opp_tokens),
|
|
GFP_KERNEL);
|
|
if (!opp_tokens)
|
|
return -ENOMEM;
|
|
|
|
- ret = sun50i_cpufreq_get_efuse(&speed);
|
|
+ ret = sun50i_cpufreq_get_efuse(match-> data, &speed);
|
|
if (ret) {
|
|
kfree(opp_tokens);
|
|
return ret;
|
|
@@ -159,8 +193,17 @@ static struct platform_driver sun50i_cpufreq_driver = {
|
|
},
|
|
};
|
|
|
|
+static const struct sunxi_cpufreq_soc_data sun50i_h616_data = {
|
|
+ .efuse_xlate = sun50i_h616_efuse_xlate,
|
|
+};
|
|
+
|
|
+static const struct sunxi_cpufreq_soc_data sun50i_h6_data = {
|
|
+ .efuse_xlate = sun50i_h6_efuse_xlate,
|
|
+};
|
|
+
|
|
static const struct of_device_id sun50i_cpufreq_match_list[] = {
|
|
- { .compatible = "allwinner,sun50i-h6" },
|
|
+ { .compatible = "allwinner,sun50i-h6", .data = &sun50i_h6_data },
|
|
+ { .compatible = "allwinner,sun50i-h616", .data = &sun50i_h616_data },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sun50i_cpufreq_match_list);
|
|
@@ -196,8 +239,8 @@ static int __init sun50i_cpufreq_init(void)
|
|
return ret;
|
|
|
|
sun50i_cpufreq_pdev =
|
|
- platform_device_register_simple("sun50i-cpufreq-nvmem",
|
|
- -1, NULL, 0);
|
|
+ platform_device_register_data(NULL,
|
|
+ "sun50i-cpufreq-nvmem", -1, match, sizeof(*match));
|
|
ret = PTR_ERR_OR_ZERO(sun50i_cpufreq_pdev);
|
|
if (ret == 0)
|
|
return 0;
|
|
--
|
|
Armbian
|
|
|