update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
..
..
@@ -4,38 +4,14 @@
4
4
  */
5
5
 
6
6
 /dts-v1/;
7
+#include "px30.dtsi"
8
+#include "px30-android.dtsi"
7
9
 #include "px30-evb-ddr3-v10.dtsi"
8
10
 #include "px30-ddr4p416dd6-timing.dtsi"
9
11
 
10
12
 / {
11
13
 	model = "Rockchip PX30 evb ddr4 board";
12
14
 	compatible = "rockchip,px30-evb-ddr4-v10", "rockchip,px30";
13
-
14
-	rk_headset: rk-headset {
15
-		compatible = "rockchip_headset";
16
-		headset_gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_LOW>;
17
-		pinctrl-names = "default";
18
-		pinctrl-0 = <&hp_det>;
19
-		io-channels = <&saradc 1>;
20
-	};
21
-
22
-	wireless-bluetooth {
23
-		compatible = "bluetooth-platdata";
24
-		clocks = <&rk809 1>;
25
-		clock-names = "ext_clock";
26
-		uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;
27
-		pinctrl-names = "default","rts_gpio";
28
-		pinctrl-0 = <&uart1_rts>;
29
-		pinctrl-1 = <&uart1_rts_gpio>;
30
-		BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
31
-		BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
32
-		BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
33
-		status = "okay";
34
-	};
35
-};
36
-
37
-&chosen {
38
-	bootargs_ext = "androidboot.boot_devices=ff390000.dwmmc,ff3b0000.nandc";
39
15
 };
40
16
 
41
17
 &dsi {
..
..
@@ -293,27 +269,6 @@
293
269
 				de-active = <0>;
294
270
 				pixelclk-active = <0>;
295
271
 			};
296
-		};
297
-	};
298
-};
299
-
300
-&gmac {
301
-	phy-supply = <&vcc_phy>;
302
-	clock_in_out = "input";
303
-	assigned-clocks = <&cru SCLK_GMAC>;
304
-	assigned-clock-parents = <&gmac_clkin>;
305
-	pinctrl-names = "default";
306
-	pinctrl-0 = <&rmii_pins &mac_refclk>;
307
-	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
308
-	snps,reset-active-low;
309
-	snps,reset-delays-us = <0 50000 50000>;
310
-	status = "okay";
311
-};
312
-
313
-&pinctrl {
314
-	headphone {
315
-		hp_det: hp-det {
316
-			rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
317
272
 		};
318
273
 	};
319
274
 };