add support 4g -- >ppp

hc

2023-11-24 2b26ab132d1b33b91c84c6d732456200e8c5ee77

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -103,7 +103,7 @@
103
103
 
104
104
 	backlight1: backlight1 {
105
105
 		compatible = "pwm-backlight";
106
-		pwms = <&pwm5 0 25000 0>;
106
+		pwms = <&pwm6 0 25000 0>;
107
107
 		brightness-levels = <
108
108
 			  0  20  20  21  21  22  22  23
109
109
 			 23  24  24  25  25  26  26  27
..
..
@@ -139,6 +139,27 @@
139
139
 			248 249 250 251 252 253 254 255
140
140
 		>;
141
141
 		default-brightness-level = <200>;
142
+	};
143
+
144
+	bt_sco: bt-sco {
145
+		status = "disabled";
146
+		compatible = "delta,dfbmcs320";
147
+		#sound-dai-cells = <1>;
148
+	};
149
+
150
+	bt_sound: bt-sound {
151
+		status = "disabled";
152
+		compatible = "simple-audio-card";
153
+		simple-audio-card,format = "dsp_a";
154
+		simple-audio-card,bitclock-inversion = <0>;
155
+		simple-audio-card,mclk-fs = <256>;
156
+		simple-audio-card,name = "rockchip,bt";
157
+		simple-audio-card,cpu {
158
+			sound-dai = <&i2s3_2ch>;
159
+		};
160
+		simple-audio-card,codec {
161
+			sound-dai = <&bt_sco 1>;
162
+		};
142
163
 	};
143
164
 
144
165
 	dc_12v: dc-12v {
..
..
@@ -187,17 +208,15 @@
187
208
 
188
209
 	rk809_sound: rk809-sound {
189
210
 		status = "okay";
190
-		compatible = "simple-audio-card";
191
-		simple-audio-card,format = "i2s";
192
-		simple-audio-card,name = "rockchip,rk809-codec";
193
-		simple-audio-card,mclk-fs = <256>;
194
-
195
-		simple-audio-card,cpu {
196
-			sound-dai = <&i2s1_8ch>;
197
-		};
198
-		simple-audio-card,codec {
199
-			sound-dai = <&rk809_codec>;
200
-		};
211
+		compatible = "rockchip,multicodecs-card";
212
+		rockchip,card-name = "rockchip-rk809";
213
+		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
214
+		rockchip,format = "i2s";
215
+		rockchip,mclk-fs = <256>;
216
+		rockchip,cpu = <&i2s1_8ch>;
217
+		rockchip,codec = <&rk809_codec>;
218
+		pinctrl-names = "default";
219
+		pinctrl-0 = <&hp_det>;
201
220
 	};
202
221
 
203
222
 	spdif-sound {
..
..
@@ -289,7 +308,7 @@
289
308
 		regulator-min-microvolt = <3300000>;
290
309
 		regulator-max-microvolt = <3300000>;
291
310
 		enable-active-high;
292
-		gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
311
+		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
293
312
 		vin-supply = <&vcc3v3_sys>;
294
313
 
295
314
 		regulator-state-mem {
..
..
@@ -333,22 +352,11 @@
333
352
 		compatible = "wlan-platdata";
334
353
 		rockchip,grf = <&grf>;
335
354
 		wifi_chip_type = "ap6398s";
336
-		status = "okay";
355
+		status = "disabled";
337
356
 	};
338
357
 
339
358
 	wireless_bluetooth: wireless-bluetooth {
340
-		compatible = "bluetooth-platdata";
341
-		clocks = <&rk809 1>;
342
-		clock-names = "ext_clock";
343
-		//wifi-bt-power-toggle;
344
-		uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
345
-		pinctrl-names = "default", "rts_gpio";
346
-		pinctrl-0 = <&uart8m0_rtsn>;
347
-		pinctrl-1 = <&uart8_gpios>;
348
-		BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
349
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
350
-		BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
351
-		status = "okay";
359
+		status = "disabled";
352
360
 	};
353
361
 
354
362
 	test-power {
..
..
@@ -1103,7 +1111,6 @@
1103
1111
 		regulator-min-microvolt = <712500>;
1104
1112
 		regulator-max-microvolt = <1390000>;
1105
1113
 		regulator-init-microvolt = <900000>;
1106
-		regulator-initial-mode = <1>;
1107
1114
 		regulator-ramp-delay = <2300>;
1108
1115
 		fcs,suspend-voltage-selector = <1>;
1109
1116
 		regulator-boot-on;
..
..
@@ -1265,8 +1272,8 @@
1265
1272
 			vccio_acodec: LDO_REG4 {
1266
1273
 				regulator-always-on;
1267
1274
 				regulator-boot-on;
1268
-				regulator-min-microvolt = <3300000>;
1269
-				regulator-max-microvolt = <3300000>;
1275
+				regulator-min-microvolt = <3000000>;
1276
+				regulator-max-microvolt = <3000000>;
1270
1277
 				regulator-name = "vccio_acodec";
1271
1278
 				regulator-state-mem {
1272
1279
 					regulator-off-in-suspend;
..
..
@@ -1380,15 +1387,6 @@
1380
1387
 
1381
1388
 &i2c1 {
1382
1389
 	status = "okay";
1383
-
1384
-	gt1x: gt1x@14 {
1385
-		compatible = "goodix,gt1x";
1386
-		reg = <0x14>;
1387
-		pinctrl-names = "default";
1388
-		pinctrl-0 = <&touch_gpio>;
1389
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1390
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1391
-	};
1392
1390
 };
1393
1391
 
1394
1392
 &i2c5 {
..
..
@@ -1421,6 +1419,12 @@
1421
1419
 		     &i2s1m0_lrcktx
1422
1420
 		     &i2s1m0_sdi0
1423
1421
 		     &i2s1m0_sdo0>;
1422
+};
1423
+
1424
+&i2s3_2ch {
1425
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1426
+	rockchip,bclk-fs = <32>;
1427
+	status = "disabled";
1424
1428
 };
1425
1429
 
1426
1430
 &iep {
..
..
@@ -1458,6 +1462,12 @@
1458
1462
 };
1459
1463
 
1460
1464
 &pinctrl {
1465
+
1466
+	headphone {
1467
+		hp_det: hp-det {
1468
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1469
+		};
1470
+	};
1461
1471
 
1462
1472
 	mxc6655xa {
1463
1473
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
..
..
@@ -1498,7 +1508,6 @@
1498
1508
 	sdio-pwrseq {
1499
1509
 		wifi_enable_h: wifi-enable-h {
1500
1510
 			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1501
-			//WIFI_REG_ON_H_GPIO2_B1
1502
1511
 		};
1503
1512
 	};
1504
1513
 
..
..
@@ -1512,11 +1521,6 @@
1512
1521
 		};
1513
1522
 	};
1514
1523
 
1515
-	wireless-bluetooth {
1516
-		uart8_gpios: uart8-gpios {
1517
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1518
-		};
1519
-	};
1520
1524
 };
1521
1525
 
1522
1526
  /*
..
..
@@ -1550,12 +1554,16 @@
1550
1554
 	status = "okay";
1551
1555
 };
1552
1556
 
1557
+&pwm6 {
1558
+	status = "okay";
1559
+};
1560
+
1553
1561
 &pwm5 {
1554
1562
 	status = "okay";
1555
1563
 };
1556
1564
 
1557
1565
 &pwm7 {
1558
-	status = "okay";
1566
+	status = "disabled";
1559
1567
 
1560
1568
 	compatible = "rockchip,remotectl-pwm";
1561
1569
 	remote_pwm_id = <3>;
..
..
@@ -1779,7 +1787,7 @@
1779
1787
 };
1780
1788
 
1781
1789
 &usbdrd_dwc3 {
1782
-	dr_mode = "otg";
1790
+	dr_mode = "host";
1783
1791
 	extcon = <&usb2phy0>;
1784
1792
 	status = "okay";
1785
1793
 };
..
..
@@ -1789,15 +1797,6 @@
1789
1797
 };
1790
1798
 
1791
1799
 &usbhost_dwc3 {
1792
-	phys = <&u2phy0_host>;
1793
-	phy-names = "usb2-phy";
1794
-	maximum-speed = "high-speed";
1795
-	snps,dis_u2_susphy_quirk;
1796
-	status = "okay";
1797
-};
1798
-
1799
-&combphy1_usq {
1800
-	rockchip,dis-u3otg1-port;
1801
1800
 	status = "okay";
1802
1801
 };
1803
1802
 
..
..
@@ -1830,8 +1829,8 @@
1830
1829
 
1831
1830
 &vop {
1832
1831
 	status = "okay";
1833
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1834
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1832
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1833
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
1835
1834
 };
1836
1835
 
1837
1836
 &vop_mmu {