X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=include%2Flinux%2Frockchip%2Fcpu.h;h=edc145550f556d3db44f4eee0d6206cfdc15ef09;hp=3b3faa71d93e08db3fe89df7a9f7bcdd9ae685eb;hb=981250553d7fa27a1430a521d6f68b5eb7657f2a;hpb=79437e337230dd5c00df8f88e7c883e39aff5dd0

diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h
index 3b3faa71d93e..edc145550f55 100644
--- a/include/linux/rockchip/cpu.h
+++ b/include/linux/rockchip/cpu.h
@@ -34,12 +34,18 @@ static inline void rockchip_set_cpu_version(unsigned long ver)
 #define ROCKCHIP_CPU_RK3188     0x31880000
 #define ROCKCHIP_CPU_RK319X     0x31900000
 #define ROCKCHIP_CPU_RK3288     0x32880000
+#define ROCKCHIP_CPU_RK3228     0x32280000
 
+#ifdef CONFIG_ARM
 #define ROCKCHIP_CPU(id, ID) \
 static inline bool cpu_is_rk##id(void) \
 { \
 	return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RK ##ID; \
 }
+#else
+#define ROCKCHIP_CPU(id, ID) \
+static inline bool cpu_is_rk##id(void) { return false; }
+#endif
 
 ROCKCHIP_CPU(2928, 2928)
 ROCKCHIP_CPU(3026, 3026)
@@ -50,6 +56,7 @@ ROCKCHIP_CPU(312x, 312X)
 ROCKCHIP_CPU(3188, 3188)
 ROCKCHIP_CPU(319x, 319X)
 ROCKCHIP_CPU(3288, 3288)
+ROCKCHIP_CPU(3228, 3228)
 
 #define ROCKCHIP_SOC_MASK	(ROCKCHIP_CPU_MASK | 0xff)
 #define ROCKCHIP_SOC_RK2926     (ROCKCHIP_CPU_RK2928 | 0x00)
@@ -71,12 +78,18 @@ ROCKCHIP_CPU(3288, 3288)
 #define ROCKCHIP_SOC_RK3188PLUS (ROCKCHIP_CPU_RK3188 | 0x10)
 #define ROCKCHIP_SOC_RK3190     (ROCKCHIP_CPU_RK319X | 0x00)
 #define ROCKCHIP_SOC_RK3288     (ROCKCHIP_CPU_RK3288 | 0x00)
+#define ROCKCHIP_SOC_RK3228     (ROCKCHIP_CPU_RK3228 | 0x00)
 
+#ifdef CONFIG_ARM
 #define ROCKCHIP_SOC(id, ID) \
 static inline bool soc_is_rk##id(void) \
 { \
 	return (rockchip_soc_id & ROCKCHIP_SOC_MASK) == ROCKCHIP_SOC_RK ##ID; \
 }
+#else
+#define ROCKCHIP_SOC(id, ID) \
+static inline bool soc_is_rk##id(void) { return false; }
+#endif
 
 ROCKCHIP_SOC(2926, 2926)
 ROCKCHIP_SOC(2928g, 2928G)
@@ -97,5 +110,6 @@ ROCKCHIP_SOC(3188, 3188)
 ROCKCHIP_SOC(3188plus, 3188PLUS)
 ROCKCHIP_SOC(3190, 3190)
 ROCKCHIP_SOC(3288, 3288)
+ROCKCHIP_SOC(3228, 3228)
 
 #endif