change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
..
..
@@ -35,23 +35,13 @@
35
35
 		compatible = "simple-audio-card";
36
36
 		simple-audio-card,format = "i2s";
37
37
 		simple-audio-card,mclk-fs = <256>;
38
-		simple-audio-card,name = "rockchip-i2s1";
38
+		simple-audio-card,name = "rockchip,i2s1-sound";
39
39
 		simple-audio-card,cpu {
40
40
 			sound-dai = <&i2s1_8ch>;
41
41
 		};
42
42
 		simple-audio-card,codec {
43
43
 			sound-dai = <&es8311>;
44
44
 		};
45
-	};
46
-
47
-	rk618_hdmi_sound: rk618-hdmi-sound {
48
-		status = "okay";
49
-		compatible = "rockchip,hdmi";
50
-		rockchip,mclk-fs = <128>;
51
-		rockchip,card-name = "rk618-hdmi";
52
-		rockchip,cpu = <&spdif_8ch>;
53
-		rockchip,codec = <&rk618_hdmi>;
54
-		rockchip,jack-det;
55
45
 	};
56
46
 
57
47
 	vcc2v5_sys: vcc2v5-ddr {
..
..
@@ -69,9 +59,8 @@
69
59
 		regulator-name = "vcc3v3_pcie";
70
60
 		regulator-min-microvolt = <3300000>;
71
61
 		regulator-max-microvolt = <3300000>;
72
-		enable-active-high;
73
62
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
74
-		startup-delay-us = <7500>;
63
+		startup-delay-us = <5000>;
75
64
 		vin-supply = <&dc_12v>;
76
65
 	};
77
66
 
..
..
@@ -240,7 +229,7 @@
240
229
 			status = "okay";
241
230
 		};
242
231
 
243
-		rk618_hdmi: hdmi {
232
+		hdmi {
244
233
 			compatible = "rockchip,rk618-hdmi";
245
234
 			clocks = <&clock HDMI_CLK>;
246
235
 			clock-names = "hdmi";
..
..
@@ -248,8 +237,6 @@
248
237
 			assigned-clock-parents = <&clock VIF0_CLK>;
249
238
 			interrupt-parent = <&gpio0>;
250
239
 			interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
251
-			rockchip,format = "spdif";
252
-			#sound-dai-cells = <0>;
253
240
 			status = "okay";
254
241
 
255
242
 			ports {
..
..
@@ -287,14 +274,12 @@
287
274
 };
288
275
 
289
276
 &pcie3x1 {
290
-	rockchip,bifurcation;
291
277
 	reset-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
292
278
 	vpcie3v3-supply = <&vcc3v3_pcie>;
293
279
 	status = "okay";
294
280
 };
295
281
 
296
282
 &pcie3x2 {
297
-	rockchip,bifurcation;
298
283
 	reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
299
284
 	vpcie3v3-supply = <&vcc3v3_pcie>;
300
285
 	status = "okay";
..
..
@@ -432,20 +417,6 @@
432
417
 	status = "okay";
433
418
 };
434
419
 
435
-&spdif_out {
436
-	status = "disabled";
437
-};
438
-
439
-&spdif_sound {
440
-	status = "disabled";
441
-};
442
-
443
-&spdif_8ch {
444
-	status = "okay";
445
-	pinctrl-names = "default";
446
-	pinctrl-0 = <&spdifm1_tx>;
447
-};
448
-
449
420
 &pinctrl {
450
421
 	rk618 {
451
422
 		rk618_reset: rk618-reeset {
..
..
@@ -462,7 +433,7 @@
462
433
 		};
463
434
 	};
464
435
 
465
-	stata {
436
+	sata {
466
437
 		sata_pm_reset: sata-pm-reset {
467
438
 			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_output_high>;
468
439
 		};