hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/soc/rockchip/rockchip-cpuinfo.c
....@@ -81,12 +81,15 @@
8181
8282 kfree(efuse_buf);
8383
84
+ dev_info(dev, "SoC\t\t: %lx\n", rockchip_soc_id);
85
+
86
+#ifdef CONFIG_NO_GKI
8487 system_serial_low = crc32(0, buf, 8);
8588 system_serial_high = crc32(system_serial_low, buf + 8, 8);
8689
87
- dev_info(dev, "SoC\t\t: %lx\n", rockchip_soc_id);
8890 dev_info(dev, "Serial\t\t: %08x%08x\n",
8991 system_serial_high, system_serial_low);
92
+#endif
9093
9194 return 0;
9295 }
....@@ -105,6 +108,16 @@
105108 },
106109 };
107110
111
+static void rockchip_set_cpu_version_from_os_reg(u32 reg)
112
+{
113
+ void __iomem *r = ioremap(reg, 0x4);
114
+
115
+ if (r) {
116
+ rockchip_set_cpu_version(readl_relaxed(r) & GENMASK(2, 0));
117
+ iounmap(r);
118
+ }
119
+}
120
+
108121 static void px30_init(void)
109122 {
110123 void __iomem *base;
....@@ -120,6 +133,19 @@
120133 rockchip_soc_id = ROCKCHIP_SOC_PX30S;
121134 iounmap(base);
122135 }
136
+}
137
+
138
+#define RV1106_OS_REG1 0xff020204
139
+static void rv1103_init(void)
140
+{
141
+ rockchip_soc_id = ROCKCHIP_SOC_RV1103;
142
+ rockchip_set_cpu_version_from_os_reg(RV1106_OS_REG1);
143
+}
144
+
145
+static void rv1106_init(void)
146
+{
147
+ rockchip_soc_id = ROCKCHIP_SOC_RV1106;
148
+ rockchip_set_cpu_version_from_os_reg(RV1106_OS_REG1);
123149 }
124150
125151 static void rv1109_init(void)
....@@ -176,10 +202,19 @@
176202 #define RK3308_GRF_CHIP_ID 0x800
177203 base = ioremap(RK3308_GRF_PHYS, SZ_4K);
178204 if (base) {
179
- if (readl_relaxed(base + RK3308_GRF_CHIP_ID) == 0x3308)
205
+ u32 v = readl_relaxed(base + RK3308_GRF_CHIP_ID);
206
+
207
+ if (v == 0x3308)
180208 rockchip_soc_id = ROCKCHIP_SOC_RK3308B;
209
+ if (v == 0x3308c)
210
+ rockchip_soc_id = ROCKCHIP_SOC_RK3308BS;
181211 iounmap(base);
182212 }
213
+}
214
+
215
+static void rk3528_init(void)
216
+{
217
+ rockchip_soc_id = ROCKCHIP_SOC_RK3528;
183218 }
184219
185220 #define RK356X_PMU_GRF_PHYS 0xfdc20000
....@@ -209,7 +244,7 @@
209244 rk356x_set_cpu_version();
210245 }
211246
212
-int __init rockchip_soc_id_init(void)
247
+int rockchip_soc_id_init(void)
213248 {
214249 if (rockchip_soc_id)
215250 return 0;
....@@ -223,11 +258,17 @@
223258 rk3126_init();
224259 } else if (cpu_is_rk3308()) {
225260 rk3308_init();
261
+ } else if (cpu_is_rv1103()) {
262
+ rv1103_init();
263
+ } else if (cpu_is_rv1106()) {
264
+ rv1106_init();
226265 } else if (cpu_is_rv1109()) {
227266 rv1109_init();
228267 } else if (cpu_is_rv1126()) {
229268 rv1126_init();
230
- } else if (cpu_is_rk3566()) {
269
+ } else if (cpu_is_rk3528()) {
270
+ rk3528_init();
271
+ } else if (cpu_is_rk3566()) {
231272 rk3566_init();
232273 } else if (cpu_is_rk3568()) {
233274 rk3568_init();
....@@ -237,6 +278,7 @@
237278
238279 return 0;
239280 }
281
+EXPORT_SYMBOL(rockchip_soc_id_init);
240282 #ifndef MODULE
241283 pure_initcall(rockchip_soc_id_init);
242284 #endif