change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
..
..
@@ -3,14 +3,11 @@
3
3
  * Copyright (c) 2017-2019 Fuzhou Rockchip Electronics Co., Ltd
4
4
  */
5
5
 
6
-/dts-v1/;
7
6
 #include <dt-bindings/gpio/gpio.h>
8
7
 #include <dt-bindings/pinctrl/rockchip.h>
9
8
 #include <dt-bindings/input/input.h>
10
9
 #include <dt-bindings/display/drm_mipi_dsi.h>
11
10
 #include <dt-bindings/sensor-dev.h>
12
-#include "px30.dtsi"
13
-#include "px30-android.dtsi"
14
11
 
15
12
 / {
16
13
 	adc-keys {
..
..
@@ -21,14 +18,14 @@
21
18
 		keyup-threshold-microvolt = <1800000>;
22
19
 
23
20
 		esc-key {
24
-			linux,code = <KEY_ESC>;
25
-			label = "esc";
21
+			linux,code = <KEY_BACK>;
22
+			label = "back";
26
23
 			press-threshold-microvolt = <1310000>;
27
24
 		};
28
25
 
29
26
 		home-key {
30
-			linux,code = <KEY_HOME>;
31
-			label = "home";
27
+			linux,code = <KEY_HOMEPAGE>;
28
+			label = "homepage";
32
29
 			press-threshold-microvolt = <624000>;
33
30
 		};
34
31
 
..
..
@@ -99,33 +96,26 @@
99
96
 		status = "okay";
100
97
 	};
101
98
 
102
-	rk809-sound {
103
-		compatible = "simple-audio-card";
104
-		simple-audio-card,format = "i2s";
105
-		simple-audio-card,name = "rockchip,rk809-codec";
106
-		simple-audio-card,mclk-fs = <256>;
107
-		simple-audio-card,widgets =
108
-			"Microphone", "Mic Jack",
109
-			"Headphone", "Headphone Jack";
110
-		simple-audio-card,routing =
111
-			"Mic Jack", "MICBIAS1",
112
-			"IN1P", "Mic Jack",
113
-			"Headphone Jack", "HPOL",
114
-			"Headphone Jack", "HPOR";
115
-		simple-audio-card,cpu {
116
-			sound-dai = <&i2s1_2ch>;
117
-		};
118
-		simple-audio-card,codec {
119
-			sound-dai = <&rk809_codec>;
120
-		};
121
-	};
122
-
123
-	rk_headset: rk-headset {
124
-		compatible = "rockchip_headset";
125
-		headset_gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>;
99
+	rk809_sound: rk809-sound {
100
+		status = "okay";
101
+		compatible = "rockchip,multicodecs-card";
102
+		rockchip,card-name = "rockchip-rk809";
103
+		hp-det-gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_LOW>;
104
+		io-channels = <&saradc 1>;
105
+		io-channel-names = "adc-detect";
106
+		keyup-threshold-microvolt = <1800000>;
107
+		poll-interval = <100>;
108
+		rockchip,format = "i2s";
109
+		rockchip,mclk-fs = <256>;
110
+		rockchip,cpu = <&i2s1_2ch>;
111
+		rockchip,codec = <&rk809_codec>;
126
112
 		pinctrl-names = "default";
127
113
 		pinctrl-0 = <&hp_det>;
128
-		io-channels = <&saradc 1>;
114
+		play-pause-key {
115
+			label = "playpause";
116
+			linux,code = <KEY_PLAYPAUSE>;
117
+			press-threshold-microvolt = <2000>;
118
+		};
129
119
 	};
130
120
 
131
121
 	sdio_pwrseq: sdio-pwrseq {
..
..
@@ -168,10 +158,11 @@
168
158
 		compatible = "wlan-platdata";
169
159
 		wifi_chip_type = "AP6210";
170
160
 		WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
161
+		WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
171
162
 		status = "okay";
172
163
 	};
173
164
 
174
-	wireless-bluetooth {
165
+	wireless_bluetooth: wireless-bluetooth {
175
166
 		compatible = "bluetooth-platdata";
176
167
 		clocks = <&rk809 1>;
177
168
 		clock-names = "ext_clock";
..
..
@@ -179,8 +170,8 @@
179
170
 		pinctrl-names = "default","rts_gpio";
180
171
 		pinctrl-0 = <&uart1_rts>;
181
172
 		pinctrl-1 = <&uart1_rts_gpio>;
182
-		BT,reset_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
183
-		BT,wake_gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
173
+		BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
174
+		BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
184
175
 		BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
185
176
 		status = "okay";
186
177
 	};
..
..
@@ -225,7 +216,8 @@
225
216
 	bus-width = <8>;
226
217
 	cap-mmc-highspeed;
227
218
 	mmc-hs200-1_8v;
228
-	supports-emmc;
219
+	no-sdio;
220
+	no-sd;
229
221
 	disable-wp;
230
222
 	non-removable;
231
223
 	num-slots = <1>;
..
..
@@ -234,7 +226,11 @@
234
226
 
235
227
 &gmac {
236
228
 	phy-supply = <&vcc_phy>;
237
-	clock_in_out = "output";
229
+	clock_in_out = "input";
230
+	assigned-clocks = <&cru SCLK_GMAC>;
231
+	assigned-clock-parents = <&gmac_clkin>;
232
+	pinctrl-names = "default";
233
+	pinctrl-0 = <&rmii_pins &mac_refclk>;
238
234
 	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
239
235
 	snps,reset-active-low;
240
236
 	snps,reset-delays-us = <0 50000 50000>;
..
..
@@ -349,13 +345,13 @@
349
345
 			vcc_3v0: DCDC_REG4 {
350
346
 				regulator-always-on;
351
347
 				regulator-boot-on;
352
-				regulator-min-microvolt = <3000000>;
353
-				regulator-max-microvolt = <3000000>;
348
+				regulator-min-microvolt = <3300000>;
349
+				regulator-max-microvolt = <3300000>;
354
350
 				regulator-initial-mode = <0x2>;
355
351
 				regulator-name = "vcc_3v0";
356
352
 				regulator-state-mem {
357
353
 					regulator-on-in-suspend;
358
-					regulator-suspend-microvolt = <3000000>;
354
+					regulator-suspend-microvolt = <3300000>;
359
355
 				};
360
356
 			};
361
357
 
..
..
@@ -400,13 +396,13 @@
400
396
 			vcc3v0_pmu: LDO_REG4 {
401
397
 				regulator-always-on;
402
398
 				regulator-boot-on;
403
-				regulator-min-microvolt = <3000000>;
404
-				regulator-max-microvolt = <3000000>;
399
+				regulator-min-microvolt = <3300000>;
400
+				regulator-max-microvolt = <3300000>;
405
401
 
406
402
 				regulator-name = "vcc3v0_pmu";
407
403
 				regulator-state-mem {
408
404
 					regulator-on-in-suspend;
409
-					regulator-suspend-microvolt = <3000000>;
405
+					regulator-suspend-microvolt = <3300000>;
410
406
 
411
407
 				};
412
408
 			};
..
..
@@ -557,17 +553,6 @@
557
553
 	i2c-scl-falling-time-ns = <50>;
558
554
 	i2c-scl-rising-time-ns = <300>;
559
555
 
560
-	dw9714: dw9714@c {
561
-		compatible = "dongwoon,dw9714";
562
-		status = "okay";
563
-		reg = <0x0c>;
564
-		rockchip,camera-module-index = <0>;
565
-		rockchip,vcm-start-current = <10>;
566
-		rockchip,vcm-rated-current = <85>;
567
-		rockchip,vcm-step-mode = <5>;
568
-		rockchip,camera-module-facing = "back";
569
-	};
570
-
571
556
 	ov5695: ov5695@36 {
572
557
 		compatible = "ovti,ov5695";
573
558
 		reg = <0x36>;
..
..
@@ -581,7 +566,6 @@
581
566
 		rockchip,camera-module-facing = "back";
582
567
 		rockchip,camera-module-name = "TongJu";
583
568
 		rockchip,camera-module-lens-name = "CHT842-MD";
584
-		lens-focus = <&dw9714>;
585
569
 		port {
586
570
 			ucam_out: endpoint {
587
571
 				remote-endpoint = <&mipi_in_ucam>;
..
..
@@ -649,7 +633,7 @@
649
633
 &pinctrl {
650
634
 	headphone {
651
635
 		hp_det: hp-det {
652
-			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
636
+			rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
653
637
 		};
654
638
 	};
655
639
 
..
..
@@ -725,7 +709,8 @@
725
709
 	bus-width = <4>;
726
710
 	cap-mmc-highspeed;
727
711
 	cap-sd-highspeed;
728
-	supports-sd;
712
+	no-sdio;
713
+	no-mmc;
729
714
 	card-detect-delay = <800>;
730
715
 	ignore-pm-notify;
731
716
 	/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
..
..
@@ -741,7 +726,8 @@
741
726
 &sdio {
742
727
 	bus-width = <4>;
743
728
 	cap-sd-highspeed;
744
-	supports-sdio;
729
+	no-sd;
730
+	no-mmc;
745
731
 	ignore-pm-notify;
746
732
 	keep-power-in-suspend;
747
733
 	non-removable;
..
..
@@ -752,7 +738,7 @@
752
738
 
753
739
 &tsadc {
754
740
 	pinctrl-names = "gpio", "otpout";
755
-	pinctrl-0 = <&tsadc_otp_gpio>;
741
+	pinctrl-0 = <&tsadc_otp_pin>;
756
742
 	pinctrl-1 = <&tsadc_otp_out>;
757
743
 	status = "okay";
758
744
 };