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

soc: rockchip: add cpuid for rk3308bs

Browse Source 
The GRF_CPU_ID support 0x3308c for RK3308BS.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I89c340006dd07179dc21147c038b16c5d8c0fed9
This commit is contained in:
Jianqun Xu
2021-07-07 11:30:32 +08:00
committed by Tao Huang
parent d462575667
commit 01238f32df
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,8 +162,12 @@ static void rk3308_init(void)
#define RK3308_GRF_CHIP_ID 0x800
base = ioremap(RK3308_GRF_PHYS, SZ_4K);
if (base) {
if (readl_relaxed(base + RK3308_GRF_CHIP_ID) == 0x3308)
u32 v = readl_relaxed(base + RK3308_GRF_CHIP_ID);
if (v == 0x3308)
rockchip_soc_id = ROCKCHIP_SOC_RK3308B;
if (v == 0x3308c)
rockchip_soc_id = ROCKCHIP_SOC_RK3308BS;
iounmap(base);
}
}

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

@@ -132,7 +132,8 @@ static inline bool cpu_is_rk3308(void)
if (rockchip_soc_id)
return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RK3308;
return of_machine_is_compatible("rockchip,rk3308");
return of_machine_is_compatible("rockchip,rk3308") ||
of_machine_is_compatible("rockchip,rk3308bs");
}
#else
static inline bool cpu_is_rk3308(void) { return false; }
@@ -168,6 +169,7 @@ static inline bool cpu_is_rk3568(void) { return false; }
#define ROCKCHIP_SOC_RK3288W (ROCKCHIP_CPU_RK3288 | 0x01)
#define ROCKCHIP_SOC_RK3308 (ROCKCHIP_CPU_RK3308 | 0x00)
#define ROCKCHIP_SOC_RK3308B (ROCKCHIP_CPU_RK3308 | 0x01)
#define ROCKCHIP_SOC_RK3308BS (ROCKCHIP_CPU_RK3308 | 0x02)
#define ROCKCHIP_SOC_RK3566 (ROCKCHIP_CPU_RK3566 | 0x00)
#define ROCKCHIP_SOC_RK3568 (ROCKCHIP_CPU_RK3568 | 0x00)
@@ -189,6 +191,7 @@ ROCKCHIP_SOC(rk3288, RK3288)
ROCKCHIP_SOC(rk3288w, RK3288W)
ROCKCHIP_SOC(rk3308, RK3308)
ROCKCHIP_SOC(rk3308b, RK3308B)
ROCKCHIP_SOC(rk3308bs, RK3308BS)
ROCKCHIP_SOC(rk3566, RK3566)
ROCKCHIP_SOC(rk3568, RK3568)