update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
..
..
@@ -247,8 +247,8 @@
247
247
 		enable-active-high;
248
248
 		enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>;
249
249
 		gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
250
-		states = <1800000 0x1
251
-			  3000000 0x0>;
250
+		states = <1800000 0x1>,
251
+			 <3000000 0x0>;
252
252
 
253
253
 		regulator-min-microvolt = <1800000>;
254
254
 		regulator-max-microvolt = <3000000>;
..
..
@@ -262,17 +262,11 @@
262
262
 	pp5000_usb_a_vbus: pp5000 {
263
263
 	};
264
264
 
265
-	gpio_keys: gpio-keys {
266
-		compatible = "gpio-keys";
267
-		pinctrl-names = "default";
268
-		pinctrl-0 = <&bt_host_wake_l>;
269
-
270
-		wake_on_bt: wake-on-bt {
271
-			label = "Wake-on-Bluetooth";
272
-			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
273
-			linux,code = <KEY_WAKEUP>;
274
-			wakeup-source;
275
-		};
265
+	ap_rtc_clk: ap-rtc-clk {
266
+		compatible = "fixed-clock";
267
+		clock-frequency = <32768>;
268
+		clock-output-names = "xin32k";
269
+		#clock-cells = <0>;
276
270
 	};
277
271
 
278
272
 	max98357a: max98357a {
..
..
@@ -287,7 +281,7 @@
287
281
 
288
282
 	sound: sound {
289
283
 		compatible = "rockchip,rk3399-gru-sound";
290
-		rockchip,cpu = <&i2s0 &i2s2>;
284
+		rockchip,cpu = <&i2s0 &spdif>;
291
285
 	};
292
286
 };
293
287
 
..
..
@@ -438,10 +432,6 @@
438
432
 	status = "okay";
439
433
 };
440
434
 
441
-&i2s2 {
442
-	status = "okay";
443
-};
444
-
445
435
 &io_domains {
446
436
 	status = "okay";
447
437
 
..
..
@@ -522,7 +512,7 @@
522
512
 	 * configured as SDMMC and not JTAG.
523
513
 	 */
524
514
 	pinctrl-names = "default";
525
-	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_cd_gpio
515
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_cd_pin
526
516
 		     &sdmmc_bus4>;
527
517
 
528
518
 	bus-width = <4>;
..
..
@@ -536,6 +526,17 @@
536
526
 	sd-uhs-sdr104;
537
527
 	vmmc-supply = <&pp3000_sd_slot>;
538
528
 	vqmmc-supply = <&ppvar_sd_card_io>;
529
+};
530
+
531
+&spdif {
532
+	status = "okay";
533
+
534
+	/*
535
+	 * SPDIF is routed internally to DP; we either don't use these pins, or
536
+	 * mux them to something else.
537
+	 */
538
+	/delete-property/ pinctrl-0;
539
+	/delete-property/ pinctrl-names;
539
540
 };
540
541
 
541
542
 &spi1 {
..
..
@@ -576,11 +577,9 @@
576
577
 			#size-cells = <0>;
577
578
 		};
578
579
 
579
-		usbc_extcon0: extcon@0 {
580
+		usbc_extcon0: extcon0 {
580
581
 			compatible = "google,extcon-usbc-cros-ec";
581
582
 			google,usb-port-id = <0>;
582
-
583
-			#extcon-cells = <0>;
584
583
 		};
585
584
 	};
586
585
 };
..
..
@@ -627,12 +626,12 @@
627
626
 
628
627
 &usbdrd3_0 {
629
628
 	status = "okay";
629
+	extcon = <&usbc_extcon0>;
630
630
 };
631
631
 
632
632
 &usbdrd_dwc3_0 {
633
633
 	status = "okay";
634
634
 	dr_mode = "host";
635
-	extcon = <&usbc_extcon0>;
636
635
 };
637
636
 
638
637
 &vopb {
..
..
@@ -775,7 +774,7 @@
775
774
 		};
776
775
 
777
776
 		/* This is where we actually hook up CD; has external pull */
778
-		sdmmc_cd_gpio: sdmmc-cd-gpio {
777
+		sdmmc_cd_pin: sdmmc-cd-pin {
779
778
 			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
780
779
 		};
781
780
 	};