From a5969cabbb4660eab42b6ef0412cbbd1200cf14d Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 12 Oct 2024 07:10:09 +0000
Subject: [PATCH] 修改led为gpio
---
kernel/drivers/soc/rockchip/rockchip-cpuinfo.c | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c b/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c
index 9eea6f3..02befb1 100644
--- a/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c
+++ b/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c
@@ -57,12 +57,9 @@
}
cell = nvmem_cell_get(dev, "id");
- if (IS_ERR(cell)) {
- dev_err(dev, "failed to get id cell: %ld\n", PTR_ERR(cell));
- if (PTR_ERR(cell) == -EPROBE_DEFER)
- return PTR_ERR(cell);
- return PTR_ERR(cell);
- }
+ if (IS_ERR(cell))
+ return dev_err_probe(dev, PTR_ERR(cell), "failed to get id cell\n");
+
efuse_buf = nvmem_cell_read(cell, &len);
nvmem_cell_put(cell);
if (IS_ERR(efuse_buf))
@@ -214,7 +211,10 @@
static void rk3528_init(void)
{
- rockchip_soc_id = ROCKCHIP_SOC_RK3528;
+ if (of_machine_is_compatible("rockchip,rk3528"))
+ rockchip_soc_id = ROCKCHIP_SOC_RK3528;
+ else if (of_machine_is_compatible("rockchip,rk3528a"))
+ rockchip_soc_id = ROCKCHIP_SOC_RK3528A;
}
#define RK356X_PMU_GRF_PHYS 0xfdc20000
@@ -235,6 +235,12 @@
static void rk3566_init(void)
{
rockchip_soc_id = ROCKCHIP_SOC_RK3566;
+ rk356x_set_cpu_version();
+}
+
+static void rk3567_init(void)
+{
+ rockchip_soc_id = ROCKCHIP_SOC_RK3567;
rk356x_set_cpu_version();
}
@@ -270,6 +276,8 @@
rk3528_init();
} else if (cpu_is_rk3566()) {
rk3566_init();
+ } else if (cpu_is_rk3567()) {
+ rk3567_init();
} else if (cpu_is_rk3568()) {
rk3568_init();
} else if (cpu_is_px30()) {
--
Gitblit v1.6.2