disable kernel build waring

hc

2024-05-10 093a6c67005148ae32a5c9e4553491b9f5c2457b

 kernel/include/linux/rockchip/cpu.h
..
..
@@ -19,6 +19,8 @@
19
19
 #define ROCKCHIP_CPU_MASK		0xffff0000
20
20
 #define ROCKCHIP_CPU_SHIFT		16
21
21
 #define ROCKCHIP_CPU_PX30		0x33260000
22
+#define ROCKCHIP_CPU_RV1103		0x11030000
23
+#define ROCKCHIP_CPU_RV1106		0x11060000
22
24
 #define ROCKCHIP_CPU_RV1109		0x11090000
23
25
 #define ROCKCHIP_CPU_RV1126		0x11260000
24
26
 #define ROCKCHIP_CPU_RK312X		0x31260000
..
..
@@ -26,9 +28,10 @@
26
28
 #define ROCKCHIP_CPU_RK3308		0x33080000
27
29
 #define ROCKCHIP_CPU_RK3528		0x35280000
28
30
 #define ROCKCHIP_CPU_RK3566		0x35660000
31
+#define ROCKCHIP_CPU_RK3567		0x35670000
29
32
 #define ROCKCHIP_CPU_RK3568		0x35680000
30
33
 
31
-#if IS_ENABLED(CONFIG_ROCKCHIP_CPUINFO)
34
+#if IS_REACHABLE(CONFIG_ROCKCHIP_CPUINFO)
32
35
 
33
36
 extern unsigned long rockchip_soc_id;
34
37
 
..
..
@@ -97,6 +100,25 @@
97
100
 static inline bool cpu_is_px30(void) { return false; }
98
101
 #endif
99
102
 
103
+#if defined(CONFIG_CPU_RV1106)
104
+static inline bool cpu_is_rv1103(void)
105
+{
106
+	if (rockchip_soc_id)
107
+		return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RV1103;
108
+	return of_machine_is_compatible("rockchip,rv1103");
109
+}
110
+
111
+static inline bool cpu_is_rv1106(void)
112
+{
113
+	if (rockchip_soc_id)
114
+		return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RV1106;
115
+	return of_machine_is_compatible("rockchip,rv1106");
116
+}
117
+#else
118
+static inline bool cpu_is_rv1103(void) { return false; }
119
+static inline bool cpu_is_rv1106(void) { return false; }
120
+#endif
121
+
100
122
 #if defined(CONFIG_CPU_RV1126) || defined(CONFIG_CPU_RV1109)
101
123
 static inline bool cpu_is_rv1109(void)
102
124
 {
..
..
@@ -148,7 +170,8 @@
148
170
 	if (rockchip_soc_id)
149
171
 		return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RK3308;
150
172
 
151
-	return of_machine_is_compatible("rockchip,rk3308");
173
+	return of_machine_is_compatible("rockchip,rk3308") ||
174
+	       of_machine_is_compatible("rockchip,rk3308bs");
152
175
 }
153
176
 #else
154
177
 static inline bool cpu_is_rk3308(void) { return false; }
..
..
@@ -159,7 +182,8 @@
159
182
 {
160
183
 	if (rockchip_soc_id)
161
184
 		return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RK3528;
162
-	return of_machine_is_compatible("rockchip,rk3528");
185
+	return of_machine_is_compatible("rockchip,rk3528") ||
186
+	       of_machine_is_compatible("rockchip,rk3528a");
163
187
 }
164
188
 #else
165
189
 static inline bool cpu_is_rk3528(void) { return false; }
..
..
@@ -173,6 +197,13 @@
173
197
 	return of_machine_is_compatible("rockchip,rk3566");
174
198
 }
175
199
 
200
+static inline bool cpu_is_rk3567(void)
201
+{
202
+	if (rockchip_soc_id)
203
+		return (rockchip_soc_id & ROCKCHIP_CPU_MASK) == ROCKCHIP_CPU_RK3567;
204
+	return of_machine_is_compatible("rockchip,rk3567");
205
+}
206
+
176
207
 static inline bool cpu_is_rk3568(void)
177
208
 {
178
209
 	if (rockchip_soc_id)
..
..
@@ -181,12 +212,15 @@
181
212
 }
182
213
 #else
183
214
 static inline bool cpu_is_rk3566(void) { return false; }
215
+static inline bool cpu_is_rk3567(void) { return false; }
184
216
 static inline bool cpu_is_rk3568(void) { return false; }
185
217
 #endif
186
218
 
187
219
 #define ROCKCHIP_SOC_MASK	(ROCKCHIP_CPU_MASK | 0xff)
188
220
 #define ROCKCHIP_SOC_PX30	(ROCKCHIP_CPU_PX30 | 0x00)
189
221
 #define ROCKCHIP_SOC_PX30S	(ROCKCHIP_CPU_PX30 | 0x01)
222
+#define ROCKCHIP_SOC_RV1103     (ROCKCHIP_CPU_RV1103 | 0x00)
223
+#define ROCKCHIP_SOC_RV1106     (ROCKCHIP_CPU_RV1106 | 0x00)
190
224
 #define ROCKCHIP_SOC_RV1109     (ROCKCHIP_CPU_RV1109 | 0x00)
191
225
 #define ROCKCHIP_SOC_RV1126     (ROCKCHIP_CPU_RV1126 | 0x00)
192
226
 #define ROCKCHIP_SOC_RK3126     (ROCKCHIP_CPU_RK312X | 0x00)
..
..
@@ -197,32 +231,42 @@
197
231
 #define ROCKCHIP_SOC_RK3288W    (ROCKCHIP_CPU_RK3288 | 0x01)
198
232
 #define ROCKCHIP_SOC_RK3308	(ROCKCHIP_CPU_RK3308 | 0x00)
199
233
 #define ROCKCHIP_SOC_RK3308B	(ROCKCHIP_CPU_RK3308 | 0x01)
234
+#define ROCKCHIP_SOC_RK3308BS	(ROCKCHIP_CPU_RK3308 | 0x02)
200
235
 #define ROCKCHIP_SOC_RK3528	(ROCKCHIP_CPU_RK3528 | 0x00)
236
+#define ROCKCHIP_SOC_RK3528A	(ROCKCHIP_CPU_RK3528 | 0x01)
201
237
 #define ROCKCHIP_SOC_RK3566	(ROCKCHIP_CPU_RK3566 | 0x00)
238
+#define ROCKCHIP_SOC_RK3567	(ROCKCHIP_CPU_RK3567 | 0x00)
202
239
 #define ROCKCHIP_SOC_RK3568	(ROCKCHIP_CPU_RK3568 | 0x00)
203
240
 
204
-#define ROCKCHIP_SOC(id, ID) \
241
+#define ROCKCHIP_SOC(CPU, id, ID) \
205
242
 static inline bool soc_is_##id(void) \
206
243
 { \
244
+	if (!IS_ENABLED(CONFIG_CPU_##CPU)) \
245
+		return false; \
207
246
 	if (rockchip_soc_id) \
208
247
 		return ((rockchip_soc_id & ROCKCHIP_SOC_MASK) == ROCKCHIP_SOC_ ##ID); \
209
248
 	return of_machine_is_compatible("rockchip,"#id); \
210
249
 }
211
250
 
212
-ROCKCHIP_SOC(px30, PX30)
213
-ROCKCHIP_SOC(px30s, PX30S)
214
-ROCKCHIP_SOC(rv1109, RV1109)
215
-ROCKCHIP_SOC(rv1126, RV1126)
216
-ROCKCHIP_SOC(rk3126, RK3126)
217
-ROCKCHIP_SOC(rk3126b, RK3126B)
218
-ROCKCHIP_SOC(rk3126c, RK3126C)
219
-ROCKCHIP_SOC(rk3128, RK3128)
220
-ROCKCHIP_SOC(rk3288, RK3288)
221
-ROCKCHIP_SOC(rk3288w, RK3288W)
222
-ROCKCHIP_SOC(rk3308, RK3308)
223
-ROCKCHIP_SOC(rk3308b, RK3308B)
224
-ROCKCHIP_SOC(rk3528, RK3528)
225
-ROCKCHIP_SOC(rk3566, RK3566)
226
-ROCKCHIP_SOC(rk3568, RK3568)
251
+ROCKCHIP_SOC(PX30, px30, PX30)
252
+ROCKCHIP_SOC(PX30, px30s, PX30S)
253
+ROCKCHIP_SOC(RV1106, rv1103, RV1103)
254
+ROCKCHIP_SOC(RV1106, rv1106, RV1106)
255
+ROCKCHIP_SOC(RV1126, rv1109, RV1109)
256
+ROCKCHIP_SOC(RV1126, rv1126, RV1126)
257
+ROCKCHIP_SOC(RK312X, rk3126, RK3126)
258
+ROCKCHIP_SOC(RK312X, rk3126b, RK3126B)
259
+ROCKCHIP_SOC(RK312X, rk3126c, RK3126C)
260
+ROCKCHIP_SOC(RK312X, rk3128, RK3128)
261
+ROCKCHIP_SOC(RK3288, rk3288, RK3288)
262
+ROCKCHIP_SOC(RK3288, rk3288w, RK3288W)
263
+ROCKCHIP_SOC(RK3308, rk3308, RK3308)
264
+ROCKCHIP_SOC(RK3308, rk3308b, RK3308B)
265
+ROCKCHIP_SOC(RK3308, rk3308bs, RK3308BS)
266
+ROCKCHIP_SOC(RK3528, rk3528, RK3528)
267
+ROCKCHIP_SOC(RK3528, rk3528a, RK3528A)
268
+ROCKCHIP_SOC(RK3568, rk3566, RK3566)
269
+ROCKCHIP_SOC(RK3567, rk3567, RK3567)
270
+ROCKCHIP_SOC(RK3568, rk3568, RK3568)
227
271
 
228
272
 #endif