update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
..
..
@@ -34,11 +34,25 @@
34
34
 		compatible = "regulator-fixed";
35
35
 		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
36
36
 		pinctrl-names = "default";
37
-		pinctrl-0 = <&sdmmc0m1_gpio>;
37
+		pinctrl-0 = <&sdmmc0m1_pin>;
38
+		regulator-boot-on;
38
39
 		regulator-name = "vcc_sd";
39
40
 		regulator-min-microvolt = <3300000>;
40
41
 		regulator-max-microvolt = <3300000>;
41
42
 		vin-supply = <&vcc_io>;
43
+	};
44
+
45
+	vcc_sdio: sdmmcio-regulator {
46
+		compatible = "regulator-gpio";
47
+		gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
48
+		states = <1800000 0x1>,
49
+			 <3300000 0x0>;
50
+		regulator-name = "vcc_sdio";
51
+		regulator-type = "voltage";
52
+		regulator-min-microvolt = <1800000>;
53
+		regulator-max-microvolt = <3300000>;
54
+		regulator-always-on;
55
+		vin-supply = <&vcc_sys>;
42
56
 	};
43
57
 
44
58
 	vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
..
..
@@ -68,18 +82,53 @@
68
82
 		regulator-always-on;
69
83
 		regulator-boot-on;
70
84
 	};
85
+
86
+	leds {
87
+		compatible = "gpio-leds";
88
+
89
+		power_led: led-0 {
90
+			label = "firefly:blue:power";
91
+			linux,default-trigger = "heartbeat";
92
+			gpios = <&rk805 1 GPIO_ACTIVE_LOW>;
93
+			default-state = "on";
94
+		};
95
+
96
+		user_led: led-1 {
97
+			label = "firefly:yellow:user";
98
+			linux,default-trigger = "mmc1";
99
+			gpios = <&rk805 0 GPIO_ACTIVE_LOW>;
100
+			default-state = "off";
101
+		};
102
+	};
71
103
 };
72
104
 
73
105
 &cpu0 {
74
106
 	cpu-supply = <&vdd_arm>;
75
107
 };
76
108
 
109
+&cpu1 {
110
+	cpu-supply = <&vdd_arm>;
111
+};
112
+
113
+&cpu2 {
114
+	cpu-supply = <&vdd_arm>;
115
+};
116
+
117
+&cpu3 {
118
+	cpu-supply = <&vdd_arm>;
119
+};
120
+
77
121
 &emmc {
78
122
 	bus-width = <8>;
79
123
 	cap-mmc-highspeed;
124
+	max-frequency = <150000000>;
125
+	mmc-ddr-1_8v;
126
+	mmc-hs200-1_8v;
80
127
 	non-removable;
81
128
 	pinctrl-names = "default";
82
129
 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
130
+	vmmc-supply = <&vcc_io>;
131
+	vqmmc-supply = <&vcc18_emmc>;
83
132
 	status = "okay";
84
133
 };
85
134
 
..
..
@@ -91,11 +140,22 @@
91
140
 	phy-mode = "rgmii";
92
141
 	pinctrl-names = "default";
93
142
 	pinctrl-0 = <&rgmiim1_pins>;
143
+	snps,aal;
94
144
 	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
95
145
 	snps,reset-active-low;
96
146
 	snps,reset-delays-us = <0 10000 50000>;
147
+	snps,rxpbl = <0x4>;
148
+	snps,txpbl = <0x4>;
97
149
 	tx_delay = <0x24>;
98
150
 	rx_delay = <0x18>;
151
+	status = "okay";
152
+};
153
+
154
+&hdmi {
155
+	status = "okay";
156
+};
157
+
158
+&hdmiphy {
99
159
 	status = "okay";
100
160
 };
101
161
 
..
..
@@ -208,6 +268,18 @@
208
268
 	};
209
269
 };
210
270
 
271
+&io_domains {
272
+	status = "okay";
273
+
274
+	vccio1-supply = <&vcc_io>;
275
+	vccio2-supply = <&vcc18_emmc>;
276
+	vccio3-supply = <&vcc_sdio>;
277
+	vccio4-supply = <&vcc_18>;
278
+	vccio5-supply = <&vcc_io>;
279
+	vccio6-supply = <&vcc_io>;
280
+	pmuio-supply = <&vcc_io>;
281
+};
282
+
211
283
 &pinctrl {
212
284
 	pmic {
213
285
 		pmic_int_l: pmic-int-l {
..
..
@@ -230,7 +302,12 @@
230
302
 	max-frequency = <150000000>;
231
303
 	pinctrl-names = "default";
232
304
 	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
305
+	sd-uhs-sdr12;
306
+	sd-uhs-sdr25;
307
+	sd-uhs-sdr50;
308
+	sd-uhs-sdr104;
233
309
 	vmmc-supply = <&vcc_sd>;
310
+	vqmmc-supply = <&vcc_sdio>;
234
311
 	status = "okay";
235
312
 };
236
313
 
..
..
@@ -266,3 +343,11 @@
266
343
 &usb_host0_ohci {
267
344
 	status = "okay";
268
345
 };
346
+
347
+&vop {
348
+	status = "okay";
349
+};
350
+
351
+&vop_mmu {
352
+	status = "okay";
353
+};