shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

soc: rockchip: cpuinfo: Export rockchip_soc_id_init() function

Browse Source 
Allow rockchip_soc_id_init() called before pure_initcall.

Change-Id: Ie0d3a18e96df02c2d6ab4aa3e17ea102685cd0c4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2021-09-10 17:09:31 +08:00
parent 5f5fd055a7
commit f08ca43b85
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/soc/rockchip/rockchip-cpuinfo.c
View File

@@ -195,8 +195,11 @@ static void rk3568_init(void)
rk356x_set_cpu_version();
}
static int __init rockchip_soc_id_init(void)
int __init rockchip_soc_id_init(void)
{
if (rockchip_soc_id)
return 0;
if (cpu_is_rk3288()) {
rk3288_init();
} else if (cpu_is_rk312x()) {

9
include/linux/rockchip/cpu.h
View File

@@ -54,6 +54,9 @@ static inline void rockchip_set_cpu(unsigned long code)
rockchip_soc_id &= ~ROCKCHIP_CPU_MASK;
rockchip_soc_id |= (code << ROCKCHIP_CPU_SHIFT) & ROCKCHIP_CPU_MASK;
}
int rockchip_soc_id_init(void);
#else
#define rockchip_soc_id 0
@@ -70,6 +73,12 @@ static inline void rockchip_set_cpu_version(unsigned long ver)
static inline void rockchip_set_cpu(unsigned long code)
{
}
static inline int rockchip_soc_id_init(void)
{
return 0;
}
#endif
#if defined(CONFIG_CPU_RV1126) || defined(CONFIG_CPU_RV1109)