update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
..
..
@@ -109,9 +109,10 @@
109
109
 	};
110
110
 
111
111
 	spdif_rx_sound: spdif-rx-sound {
112
-		status = "disabled";
113
112
 		compatible = "simple-audio-card";
114
113
 		simple-audio-card,name = "rockchip,spdif-rx-sound";
114
+		status = "disabled";
115
+
115
116
 		simple-audio-card,cpu {
116
117
 			sound-dai = <&spdif_rx>;
117
118
 		};
..
..
@@ -121,9 +122,10 @@
121
122
 	};
122
123
 
123
124
 	spdif_tx_sound: spdif-tx-sound {
124
-		status = "disabled";
125
125
 		compatible = "simple-audio-card";
126
126
 		simple-audio-card,name = "rockchip,spdif-tx-sound";
127
+		status = "disabled";
128
+		simple-audio-card,mclk-fs = <128>;
127
129
 		simple-audio-card,cpu {
128
130
 			sound-dai = <&spdif_tx>;
129
131
 		};
..
..
@@ -163,6 +165,15 @@
163
165
 		regulator-max-microvolt = <1000000>;
164
166
 	};
165
167
 
168
+	vcc_3v3_codec: vcc_io: vcc-io {
169
+		compatible = "regulator-fixed";
170
+		regulator-name = "vcc_io";
171
+		regulator-always-on;
172
+		regulator-boot-on;
173
+		regulator-min-microvolt = <3300000>;
174
+		regulator-max-microvolt = <3300000>;
175
+	};
176
+
166
177
 	vccio_sdio: vcc_1v8: vcc-1v8 {
167
178
 		compatible = "regulator-fixed";
168
179
 		regulator-name = "vcc_1v8";
..
..
@@ -190,15 +201,6 @@
190
201
 		regulator-boot-on;
191
202
 		regulator-min-microvolt = <1500000>;
192
203
 		regulator-max-microvolt = <1500000>;
193
-	};
194
-
195
-	vcc_3v3_codec: vcc_io: vcc-io {
196
-		compatible = "regulator-fixed";
197
-		regulator-name = "vcc_io";
198
-		regulator-always-on;
199
-		regulator-boot-on;
200
-		regulator-min-microvolt = <3300000>;
201
-		regulator-max-microvolt = <3300000>;
202
204
 	};
203
205
 
204
206
 	vccio_flash: vccio-flash {
..
..
@@ -231,7 +233,7 @@
231
233
 		uart_rts_gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>;
232
234
 		pinctrl-names = "default", "rts_gpio";
233
235
 		pinctrl-0 = <&uart0_rts>;
234
-		pinctrl-1 = <&uart0_rts_gpio>;
236
+		pinctrl-1 = <&uart0_rts_pin>;
235
237
 		BT,power_gpio    = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
236
238
 		BT,wake_host_irq = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
237
239
 		status = "okay";
..
..
@@ -241,7 +243,7 @@
241
243
 		compatible = "wlan-platdata";
242
244
 		rockchip,grf = <&grf>;
243
245
 		pinctrl-names = "default";
244
-		pinctrl-0 = <&wifi_wake_host>;
246
+		pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>;
245
247
 		wifi_chip_type = "ap6255";
246
248
 		WIFI,host_wake_irq = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
247
249
 		status = "okay";
..
..
@@ -269,6 +271,15 @@
269
271
 	};
270
272
 };
271
273
 
274
+&rk3308bs_cpu0_opp_table {
275
+	opp-1008000000 {
276
+		status = "okay";
277
+	};
278
+	opp-1104000000 {
279
+		status = "okay";
280
+	};
281
+};
282
+
272
283
 &dmc {
273
284
 	center-supply = <&vdd_log>;
274
285
 	status = "okay";
..
..
@@ -278,7 +289,8 @@
278
289
 	bus-width = <8>;
279
290
 	cap-mmc-highspeed;
280
291
 	mmc-hs200-1_8v;
281
-	supports-emmc;
292
+	no-sdio;
293
+	no-sd;
282
294
 	disable-wp;
283
295
 	non-removable;
284
296
 	num-slots = <1>;
..
..
@@ -305,9 +317,9 @@
305
317
 	clock-frequency = <400000>;
306
318
 	status = "okay";
307
319
 
308
-	is31fl3236: led-controller@3c {
320
+	is31fl3236: led-controller@3f {
309
321
 		compatible = "issi,is31fl3236";
310
-		reg = <0x3c>;
322
+		reg = <0x3f>;
311
323
 		#address-cells = <1>;
312
324
 		#size-cells = <0>;
313
325
 		reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
..
..
@@ -671,9 +683,6 @@
671
683
 };
672
684
 
673
685
 &pinctrl {
674
-	pinctrl-names = "default";
675
-	pinctrl-0 = <&rtc_32k>;
676
-
677
686
 	buttons {
678
687
 		pwr_key: pwr-key {
679
688
 			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
..
..
@@ -689,6 +698,12 @@
689
698
 	sdio-pwrseq {
690
699
 		wifi_enable_h: wifi-enable-h {
691
700
 			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
701
+		};
702
+	};
703
+
704
+	wireless-bluetooth {
705
+		uart0_gpios: uart0-gpios {
706
+			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
692
707
 		};
693
708
 	};
694
709
 
..
..
@@ -719,6 +734,14 @@
719
734
 	status = "okay";
720
735
 };
721
736
 
737
+&spdif_rx {
738
+	#sound-dai-cells = <0>;
739
+};
740
+
741
+&spdif_tx {
742
+	#sound-dai-cells = <0>;
743
+};
744
+
722
745
 &saradc {
723
746
 	status = "okay";
724
747
 	vref-supply = <&vcc_1v8>;
..
..
@@ -727,7 +750,8 @@
727
750
 &sdmmc {
728
751
 	bus-width = <4>;
729
752
 	cap-sd-highspeed;
730
-	supports-sdio;
753
+	no-sd;
754
+	no-mmc;
731
755
 	ignore-pm-notify;
732
756
 	keep-power-in-suspend;
733
757
 	non-removable;