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
 
..
..
@@ -161,10 +158,11 @@
161
158
 		compatible = "wlan-platdata";
162
159
 		wifi_chip_type = "AP6210";
163
160
 		WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
161
+		WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
164
162
 		status = "okay";
165
163
 	};
166
164
 
167
-	wireless-bluetooth {
165
+	wireless_bluetooth: wireless-bluetooth {
168
166
 		compatible = "bluetooth-platdata";
169
167
 		clocks = <&rk809 1>;
170
168
 		clock-names = "ext_clock";
..
..
@@ -172,8 +170,8 @@
172
170
 		pinctrl-names = "default","rts_gpio";
173
171
 		pinctrl-0 = <&uart1_rts>;
174
172
 		pinctrl-1 = <&uart1_rts_gpio>;
175
-		BT,reset_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
176
-		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>;
177
175
 		BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
178
176
 		status = "okay";
179
177
 	};
..
..
@@ -218,7 +216,8 @@
218
216
 	bus-width = <8>;
219
217
 	cap-mmc-highspeed;
220
218
 	mmc-hs200-1_8v;
221
-	supports-emmc;
219
+	no-sdio;
220
+	no-sd;
222
221
 	disable-wp;
223
222
 	non-removable;
224
223
 	num-slots = <1>;
..
..
@@ -227,7 +226,11 @@
227
226
 
228
227
 &gmac {
229
228
 	phy-supply = <&vcc_phy>;
230
-	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>;
231
234
 	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
232
235
 	snps,reset-active-low;
233
236
 	snps,reset-delays-us = <0 50000 50000>;
..
..
@@ -342,13 +345,13 @@
342
345
 			vcc_3v0: DCDC_REG4 {
343
346
 				regulator-always-on;
344
347
 				regulator-boot-on;
345
-				regulator-min-microvolt = <3000000>;
346
-				regulator-max-microvolt = <3000000>;
348
+				regulator-min-microvolt = <3300000>;
349
+				regulator-max-microvolt = <3300000>;
347
350
 				regulator-initial-mode = <0x2>;
348
351
 				regulator-name = "vcc_3v0";
349
352
 				regulator-state-mem {
350
353
 					regulator-on-in-suspend;
351
-					regulator-suspend-microvolt = <3000000>;
354
+					regulator-suspend-microvolt = <3300000>;
352
355
 				};
353
356
 			};
354
357
 
..
..
@@ -393,13 +396,13 @@
393
396
 			vcc3v0_pmu: LDO_REG4 {
394
397
 				regulator-always-on;
395
398
 				regulator-boot-on;
396
-				regulator-min-microvolt = <3000000>;
397
-				regulator-max-microvolt = <3000000>;
399
+				regulator-min-microvolt = <3300000>;
400
+				regulator-max-microvolt = <3300000>;
398
401
 
399
402
 				regulator-name = "vcc3v0_pmu";
400
403
 				regulator-state-mem {
401
404
 					regulator-on-in-suspend;
402
-					regulator-suspend-microvolt = <3000000>;
405
+					regulator-suspend-microvolt = <3300000>;
403
406
 
404
407
 				};
405
408
 			};
..
..
@@ -550,17 +553,6 @@
550
553
 	i2c-scl-falling-time-ns = <50>;
551
554
 	i2c-scl-rising-time-ns = <300>;
552
555
 
553
-	dw9714: dw9714@c {
554
-		compatible = "dongwoon,dw9714";
555
-		status = "okay";
556
-		reg = <0x0c>;
557
-		rockchip,camera-module-index = <0>;
558
-		rockchip,vcm-start-current = <10>;
559
-		rockchip,vcm-rated-current = <85>;
560
-		rockchip,vcm-step-mode = <5>;
561
-		rockchip,camera-module-facing = "back";
562
-	};
563
-
564
556
 	ov5695: ov5695@36 {
565
557
 		compatible = "ovti,ov5695";
566
558
 		reg = <0x36>;
..
..
@@ -574,7 +566,6 @@
574
566
 		rockchip,camera-module-facing = "back";
575
567
 		rockchip,camera-module-name = "TongJu";
576
568
 		rockchip,camera-module-lens-name = "CHT842-MD";
577
-		lens-focus = <&dw9714>;
578
569
 		port {
579
570
 			ucam_out: endpoint {
580
571
 				remote-endpoint = <&mipi_in_ucam>;
..
..
@@ -642,7 +633,7 @@
642
633
 &pinctrl {
643
634
 	headphone {
644
635
 		hp_det: hp-det {
645
-			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
636
+			rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
646
637
 		};
647
638
 	};
648
639
 
..
..
@@ -718,7 +709,8 @@
718
709
 	bus-width = <4>;
719
710
 	cap-mmc-highspeed;
720
711
 	cap-sd-highspeed;
721
-	supports-sd;
712
+	no-sdio;
713
+	no-mmc;
722
714
 	card-detect-delay = <800>;
723
715
 	ignore-pm-notify;
724
716
 	/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
..
..
@@ -734,7 +726,8 @@
734
726
 &sdio {
735
727
 	bus-width = <4>;
736
728
 	cap-sd-highspeed;
737
-	supports-sdio;
729
+	no-sd;
730
+	no-mmc;
738
731
 	ignore-pm-notify;
739
732
 	keep-power-in-suspend;
740
733
 	non-removable;
..
..
@@ -745,7 +738,7 @@
745
738
 
746
739
 &tsadc {
747
740
 	pinctrl-names = "gpio", "otpout";
748
-	pinctrl-0 = <&tsadc_otp_gpio>;
741
+	pinctrl-0 = <&tsadc_otp_pin>;
749
742
 	pinctrl-1 = <&tsadc_otp_out>;
750
743
 	status = "okay";
751
744
 };