rockchip: cpu: soc_is_xxx() depends on CPU config

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id32ac13361edf2b06b4747f0a52175f258654252
This commit is contained in:
Tao Huang
2022-05-18 19:49:16 +08:00
parent 7e5c72a3e6
commit c12aebd032

View File

@@ -190,28 +190,30 @@ static inline bool cpu_is_rk3568(void) { return false; }
#define ROCKCHIP_SOC_RK3566 (ROCKCHIP_CPU_RK3566 | 0x00)
#define ROCKCHIP_SOC_RK3568 (ROCKCHIP_CPU_RK3568 | 0x00)
#define ROCKCHIP_SOC(id, ID) \
#define ROCKCHIP_SOC(CPU, id, ID) \
static inline bool soc_is_##id(void) \
{ \
if (!IS_ENABLED(CONFIG_CPU_##CPU)) \
return false; \
if (rockchip_soc_id) \
return ((rockchip_soc_id & ROCKCHIP_SOC_MASK) == ROCKCHIP_SOC_ ##ID); \
return of_machine_is_compatible("rockchip,"#id); \
}
ROCKCHIP_SOC(px30, PX30)
ROCKCHIP_SOC(px30s, PX30S)
ROCKCHIP_SOC(rv1109, RV1109)
ROCKCHIP_SOC(rv1126, RV1126)
ROCKCHIP_SOC(rk3126, RK3126)
ROCKCHIP_SOC(rk3126b, RK3126B)
ROCKCHIP_SOC(rk3126c, RK3126C)
ROCKCHIP_SOC(rk3128, RK3128)
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)
ROCKCHIP_SOC(PX30, px30, PX30)
ROCKCHIP_SOC(PX30, px30s, PX30S)
ROCKCHIP_SOC(RV1126, rv1109, RV1109)
ROCKCHIP_SOC(RV1126, rv1126, RV1126)
ROCKCHIP_SOC(RK312X, rk3126, RK3126)
ROCKCHIP_SOC(RK312X, rk3126b, RK3126B)
ROCKCHIP_SOC(RK312X, rk3126c, RK3126C)
ROCKCHIP_SOC(RK312X, rk3128, RK3128)
ROCKCHIP_SOC(RK3288, rk3288, RK3288)
ROCKCHIP_SOC(RK3288, rk3288w, RK3288W)
ROCKCHIP_SOC(RK3308, rk3308, RK3308)
ROCKCHIP_SOC(RK3308, rk3308b, RK3308B)
ROCKCHIP_SOC(RK3308, rk3308bs, RK3308BS)
ROCKCHIP_SOC(RK3568, rk3566, RK3566)
ROCKCHIP_SOC(RK3568, rk3568, RK3568)
#endif