change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
..
..
@@ -3,15 +3,11 @@
3
3
  * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
4
4
  */
5
5
 
6
-/dts-v1/;
7
6
 #include <dt-bindings/display/drm_mipi_dsi.h>
8
7
 #include <dt-bindings/gpio/gpio.h>
9
8
 #include <dt-bindings/input/input.h>
10
9
 #include <dt-bindings/pinctrl/rockchip.h>
11
10
 #include <dt-bindings/sensor-dev.h>
12
-#include "rk3326.dtsi"
13
-#include "rk3326-863-cif-sensor.dtsi"
14
-#include "px30-android.dtsi"
15
11
 
16
12
 / {
17
13
 	adc-keys {
..
..
@@ -22,14 +18,14 @@
22
18
 		keyup-threshold-microvolt = <1800000>;
23
19
 
24
20
 		esc-key {
25
-			linux,code = <KEY_ESC>;
26
-			label = "esc";
21
+			linux,code = <KEY_BACK>;
22
+			label = "back";
27
23
 			press-threshold-microvolt = <1310000>;
28
24
 		};
29
25
 
30
26
 		home-key {
31
-			linux,code = <KEY_HOME>;
32
-			label = "home";
27
+			linux,code = <KEY_HOMEPAGE>;
28
+			label = "homepage";
33
29
 			press-threshold-microvolt = <624000>;
34
30
 		};
35
31
 
..
..
@@ -92,32 +88,24 @@
92
88
 	};
93
89
 
94
90
 	rk817-sound {
95
-		compatible = "simple-audio-card";
96
-		simple-audio-card,format = "i2s";
97
-		simple-audio-card,name = "rockchip,rk817-codec";
98
-		simple-audio-card,mclk-fs = <256>;
99
-		simple-audio-card,widgets =
100
-			"Microphone", "Mic Jack",
101
-			"Headphone", "Headphone Jack";
102
-		simple-audio-card,routing =
103
-			"Mic Jack", "MICBIAS1",
104
-			"IN1P", "Mic Jack",
105
-			"Headphone Jack", "HPOL",
106
-			"Headphone Jack", "HPOR";
107
-		simple-audio-card,cpu {
108
-			sound-dai = <&i2s1_2ch>;
109
-		};
110
-		simple-audio-card,codec {
111
-			sound-dai = <&rk817_codec>;
112
-		};
113
-	};
114
-
115
-	rk_headset: rk-headset {
116
-		compatible = "rockchip_headset";
117
-		headset_gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
91
+		compatible = "rockchip,multicodecs-card";
92
+		rockchip,card-name = "rockchip-rk817";
93
+		hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
94
+		io-channels = <&saradc 1>;
95
+		io-channel-names = "adc-detect";
96
+		keyup-threshold-microvolt = <1800000>;
97
+		poll-interval = <100>;
98
+		rockchip,format = "i2s";
99
+		rockchip,mclk-fs = <256>;
100
+		rockchip,cpu = <&i2s1_2ch>;
101
+		rockchip,codec = <&rk817_codec>;
118
102
 		pinctrl-names = "default";
119
103
 		pinctrl-0 = <&hp_det>;
120
-		io-channels = <&saradc 1>;
104
+		play-pause-key {
105
+			label = "playpause";
106
+			linux,code = <KEY_PLAYPAUSE>;
107
+			press-threshold-microvolt = <2000>;
108
+		};
121
109
 	};
122
110
 
123
111
 	sdio_pwrseq: sdio-pwrseq {
..
..
@@ -153,6 +141,7 @@
153
141
 		compatible = "wlan-platdata";
154
142
 		wifi_chip_type = "AP6210";
155
143
 		WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
144
+		WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
156
145
 		status = "okay";
157
146
 	};
158
147
 
..
..
@@ -316,10 +305,6 @@
316
305
 	status = "okay";
317
306
 };
318
307
 
319
-&dsi_in_vopl {
320
-	status = "disabled";
321
-};
322
-
323
308
 &route_dsi {
324
309
 	connect = <&vopb_out_dsi>;
325
310
 	status = "okay";
..
..
@@ -338,7 +323,8 @@
338
323
 	bus-width = <8>;
339
324
 	cap-mmc-highspeed;
340
325
 	mmc-hs200-1_8v;
341
-	supports-emmc;
326
+	no-sdio;
327
+	no-sd;
342
328
 	disable-wp;
343
329
 	non-removable;
344
330
 	num-slots = <1>;
..
..
@@ -793,7 +779,8 @@
793
779
 	bus-width = <4>;
794
780
 	cap-mmc-highspeed;
795
781
 	cap-sd-highspeed;
796
-	supports-sd;
782
+	no-sdio;
783
+	no-mmc;
797
784
 	card-detect-delay = <800>;
798
785
 	ignore-pm-notify;
799
786
 	/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
..
..
@@ -809,7 +796,8 @@
809
796
 &sdio {
810
797
 	bus-width = <4>;
811
798
 	cap-sd-highspeed;
812
-	supports-sdio;
799
+	no-sd;
800
+	no-mmc;
813
801
 	ignore-pm-notify;
814
802
 	keep-power-in-suspend;
815
803
 	non-removable;
..
..
@@ -820,7 +808,7 @@
820
808
 
821
809
 &tsadc {
822
810
 	pinctrl-names = "gpio", "otpout";
823
-	pinctrl-0 = <&tsadc_otp_gpio>;
811
+	pinctrl-0 = <&tsadc_otp_pin>;
824
812
 	pinctrl-1 = <&tsadc_otp_out>;
825
813
 	status = "okay";
826
814
 };
..
..
@@ -852,14 +840,6 @@
852
840
 };
853
841
 
854
842
 &vopb_mmu {
855
-	status = "okay";
856
-};
857
-
858
-&vopl {
859
-	status = "okay";
860
-};
861
-
862
-&vopl_mmu {
863
843
 	status = "okay";
864
844
 };
865
845