From 195d03b6cbc79bc149ca968bde93271a71c3f4fe Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 9 Mar 2018 20:13:25 +0800 Subject: [PATCH] rockchip: cpu: cpu_is_xxx depends on CPU config Change-Id: I8c84af7b41da306b20a6d3653deaeee6ce49ea31 Signed-off-by: Tao Huang --- include/linux/rockchip/cpu.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h index 75f7d65d5809..7eb082722227 100644 --- a/include/linux/rockchip/cpu.h +++ b/include/linux/rockchip/cpu.h @@ -55,6 +55,7 @@ static inline void rockchip_set_cpu_version(unsigned long ver) #define ROCKCHIP_CPU_RK312X 0x31260000 #define ROCKCHIP_CPU_RK3288 0x32880000 +#ifdef CONFIG_CPU_RK312X static inline bool cpu_is_rk312x(void) { if (rockchip_soc_id) @@ -64,7 +65,11 @@ static inline bool cpu_is_rk312x(void) of_machine_is_compatible("rockchip,rk3126c") || of_machine_is_compatible("rockchip,rk3128"); } +#else +static inline bool cpu_is_rk312x(void) { return false; } +#endif +#ifdef CONFIG_CPU_RK3288 static inline bool cpu_is_rk3288(void) { if (rockchip_soc_id) @@ -72,6 +77,9 @@ static inline bool cpu_is_rk3288(void) return of_machine_is_compatible("rockchip,rk3288") || of_machine_is_compatible("rockchip,rk3288w"); } +#else +static inline bool cpu_is_rk3288(void) { return false; } +#endif #define ROCKCHIP_SOC_MASK (ROCKCHIP_CPU_MASK | 0xff) #define ROCKCHIP_SOC_RK3126 (ROCKCHIP_CPU_RK312X | 0x00)