update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm/mach-rockchip/rv1106_pm.h
..
..
@@ -7,6 +7,7 @@
7
7
 #define __MACH_ROCKCHIP_RV1106_PM_H
8
8
 
9
9
 #define RV1106_WAKEUP_TO_SYSTEM_RESET	0
10
+#define RV1106_HPMCU_FAST_WKUP_TIMEOUT	2000 /* ms */
10
11
 
11
12
 #define RV1106_PERIGRF_OFFSET		0x0
12
13
 #define RV1106_VENCGRF_OFFSET		0x10000
..
..
@@ -34,6 +35,7 @@
34
35
 
35
36
 #define RV1106_PMUCRU_OFFSET		0x3a0000
36
37
 #define RV1106_CRU_OFFSET		0x3b0000
38
+#define RV1106_PVTPLLCRU_OFFSET		0x3b1000
37
39
 #define RV1106_PERICRU_OFFSET		0x3b2000
38
40
 #define RV1106_VICRU_OFFSET		0x3b4000
39
41
 #define RV1106_NPUCRU_OFFSET		0x3b6000
..
..
@@ -54,6 +56,7 @@
54
56
 
55
57
 #define RV1106_NSTIMER_OFFSET		0x580000
56
58
 #define RV1106_STIMER_OFFSET		0x590000
59
+#define RV1106_MBOX_OFFSET		0x5c0000
57
60
 #define RV1106_PMUSRAM_OFFSET		0x670000
58
61
 #define RV1106_DDRC_OFFSET		0x800000
59
62
 #define RV1106_FW_DDR_OFFSET		0x900000
..
..
@@ -70,6 +73,8 @@
70
73
 #define RV1106_CRU_MODE_CON00		0x280
71
74
 #define RV1106_CRU_GATE_CON(i)		(0x800 + (i) * 4)
72
75
 #define RV1106_CRU_GATE_CON_NUM		4
76
+#define RV1106_CRU_GLB_SRST_FST		0xc08
77
+#define RV1106_CRU_GLB_RST_CON		0xc10
73
78
 
74
79
 #define CRU_PLLCON1_PWRDOWN		BIT(13)
75
80
 #define CRU_PLLCON1_LOCK_STATUS		BIT(10)
..
..
@@ -101,6 +106,7 @@
101
106
 #define RV1106_CORECRU_GATE_CON(i)	(0x800 + (i) * 4)
102
107
 #define RV1106_COERCRU_CLKSEL_CON(i)	(0x300 + (i) * 4)
103
108
 #define RV1106_CORECRU_GATE_CON_NUM	2
109
+#define RV1106_COERCRU_SFTRST_CON(i)	(0xa00 + (i) * 4)
104
110
 
105
111
 /* grf */
106
112
 #define RV1106_PMUGRF_SOC_CON(i)	((i) * 4)
..
..
@@ -109,6 +115,11 @@
109
115
 #define RV1106_PMUSGRF_SOC_CON(i)	((i) * 4)
110
116
 
111
117
 #define RV1106_DDRGRF_CON(i)		((i) * 0x4)
118
+
119
+#define RV1106_CORESGRF_HPMCU_BOOTADDR		0x44
120
+
121
+#define RV1106_COREGRF_CACHE_PERI_ADDR_START	0x24
122
+#define RV1106_COREGRF_CACHE_PERI_ADDR_END	0x28
112
123
 
113
124
 /* pvmt */
114
125
 #define RV1106_PVTM_CON(i)		(0x4 + (i) * 4)
..
..
@@ -177,6 +188,17 @@
177
188
 #define PMU_SUSPEND_MAGIC		0x02468ace
178
189
 #define PMU_RESUME_MAGIC		0x13579bdf
179
190
 
191
+/* mcu */
192
+#define RV1106_MBOX_B2A_STATUS		0x2c
193
+#define RV1106_MBOX_B2A_CMD_0		0x30
194
+
195
+#define RV1106_HPMCU_MBOX_IRQ_AP	33
196
+
197
+#define RV1106_HPMCU_BOOT_ADDR		0x40000
198
+#define RV1106_MBOX_CMD_AP_SUSPEND	0x12345600
199
+#define RV1106_MBOX_CMD_AP_RESUME	0x12345601
200
+#define RV1106_SYS_IS_WKUP		0x87654300
201
+
180
202
 #ifndef __ASSEMBLER__
181
203
 extern unsigned long rkpm_bootdata_cpusp;
182
204
 extern unsigned long rkpm_bootdata_cpu_code;
..
..
@@ -216,7 +238,7 @@
216
238
 
217
239
 	RV1106_PMU_WAKEUP_USBDEV_EN,
218
240
 	RV1106_PMU_WAKEUP_TIMER_EN,
219
-	RV1106_PMU_WAKEUP_TIMEROUT_EN,
241
+	RV1106_PMU_WAKEUP_TIMEOUT_EN,
220
242
 	RV1106_PMU_WAKEUP_SFT_WAKEUP_CFG,
221
243
 };
222
244