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 {
..
..
@@ -273,8 +292,6 @@
273
292
 	vcc5v0_otg: vcc5v0-otg-regulator {
274
293
 		compatible = "regulator-fixed";
275
294
 		regulator-name = "vcc5v0_otg";
276
-		egulator-boot-on;
277
-		regulator-always-on;
278
295
 		regulator-min-microvolt = <5000000>;
279
296
 		regulator-max-microvolt = <5000000>;
280
297
 		enable-active-high;
..
..
@@ -291,7 +308,7 @@
291
308
 		regulator-min-microvolt = <3300000>;
292
309
 		regulator-max-microvolt = <3300000>;
293
310
 		enable-active-high;
294
-		gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
311
+		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
295
312
 		vin-supply = <&vcc3v3_sys>;
296
313
 
297
314
 		regulator-state-mem {
..
..
@@ -335,22 +352,11 @@
335
352
 		compatible = "wlan-platdata";
336
353
 		rockchip,grf = <&grf>;
337
354
 		wifi_chip_type = "ap6398s";
338
-		status = "okay";
355
+		status = "disabled";
339
356
 	};
340
357
 
341
358
 	wireless_bluetooth: wireless-bluetooth {
342
-		compatible = "bluetooth-platdata";
343
-		clocks = <&rk809 1>;
344
-		clock-names = "ext_clock";
345
-		//wifi-bt-power-toggle;
346
-		uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
347
-		pinctrl-names = "default", "rts_gpio";
348
-		pinctrl-0 = <&uart8m0_rtsn>;
349
-		pinctrl-1 = <&uart8_gpios>;
350
-		BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
351
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
352
-		BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
353
-		status = "okay";
359
+		status = "disabled";
354
360
 	};
355
361
 
356
362
 	test-power {
..
..
@@ -1105,7 +1111,6 @@
1105
1111
 		regulator-min-microvolt = <712500>;
1106
1112
 		regulator-max-microvolt = <1390000>;
1107
1113
 		regulator-init-microvolt = <900000>;
1108
-		regulator-initial-mode = <1>;
1109
1114
 		regulator-ramp-delay = <2300>;
1110
1115
 		fcs,suspend-voltage-selector = <1>;
1111
1116
 		regulator-boot-on;
..
..
@@ -1267,8 +1272,8 @@
1267
1272
 			vccio_acodec: LDO_REG4 {
1268
1273
 				regulator-always-on;
1269
1274
 				regulator-boot-on;
1270
-				regulator-min-microvolt = <3300000>;
1271
-				regulator-max-microvolt = <3300000>;
1275
+				regulator-min-microvolt = <3000000>;
1276
+				regulator-max-microvolt = <3000000>;
1272
1277
 				regulator-name = "vccio_acodec";
1273
1278
 				regulator-state-mem {
1274
1279
 					regulator-off-in-suspend;
..
..
@@ -1382,15 +1387,6 @@
1382
1387
 
1383
1388
 &i2c1 {
1384
1389
 	status = "okay";
1385
-
1386
-	gt1x: gt1x@14 {
1387
-		compatible = "goodix,gt1x";
1388
-		reg = <0x14>;
1389
-		pinctrl-names = "default";
1390
-		pinctrl-0 = <&touch_gpio>;
1391
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1392
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1393
-	};
1394
1390
 };
1395
1391
 
1396
1392
 &i2c5 {
..
..
@@ -1423,6 +1419,12 @@
1423
1419
 		     &i2s1m0_lrcktx
1424
1420
 		     &i2s1m0_sdi0
1425
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";
1426
1428
 };
1427
1429
 
1428
1430
 &iep {
..
..
@@ -1460,6 +1462,12 @@
1460
1462
 };
1461
1463
 
1462
1464
 &pinctrl {
1465
+
1466
+	headphone {
1467
+		hp_det: hp-det {
1468
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1469
+		};
1470
+	};
1463
1471
 
1464
1472
 	mxc6655xa {
1465
1473
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
..
..
@@ -1500,7 +1508,6 @@
1500
1508
 	sdio-pwrseq {
1501
1509
 		wifi_enable_h: wifi-enable-h {
1502
1510
 			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1503
-			//WIFI_REG_ON_H_GPIO2_B1
1504
1511
 		};
1505
1512
 	};
1506
1513
 
..
..
@@ -1514,11 +1521,6 @@
1514
1521
 		};
1515
1522
 	};
1516
1523
 
1517
-	wireless-bluetooth {
1518
-		uart8_gpios: uart8-gpios {
1519
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1520
-		};
1521
-	};
1522
1524
 };
1523
1525
 
1524
1526
  /*
..
..
@@ -1552,12 +1554,16 @@
1552
1554
 	status = "okay";
1553
1555
 };
1554
1556
 
1557
+&pwm6 {
1558
+	status = "okay";
1559
+};
1560
+
1555
1561
 &pwm5 {
1556
1562
 	status = "okay";
1557
1563
 };
1558
1564
 
1559
1565
 &pwm7 {
1560
-	status = "okay";
1566
+	status = "disabled";
1561
1567
 
1562
1568
 	compatible = "rockchip,remotectl-pwm";
1563
1569
 	remote_pwm_id = <3>;
..
..
@@ -1781,7 +1787,7 @@
1781
1787
 };
1782
1788
 
1783
1789
 &usbdrd_dwc3 {
1784
-	dr_mode = "otg";
1790
+	dr_mode = "host";
1785
1791
 	extcon = <&usb2phy0>;
1786
1792
 	status = "okay";
1787
1793
 };
..
..
@@ -1791,15 +1797,6 @@
1791
1797
 };
1792
1798
 
1793
1799
 &usbhost_dwc3 {
1794
-//	phys = <&u2phy0_host>;
1795
-//	phy-names = "usb2-phy";
1796
-//	maximum-speed = "high-speed";
1797
-//	snps,dis_u2_susphy_quirk;
1798
-	status = "okay";
1799
-};
1800
-
1801
-&combphy1_usq {
1802
-//	rockchip,dis-u3otg1-port;
1803
1800
 	status = "okay";
1804
1801
 };
1805
1802
 
..
..
@@ -1832,8 +1829,8 @@
1832
1829
 
1833
1830
 &vop {
1834
1831
 	status = "okay";
1835
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1836
-	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>;
1837
1834
 };
1838
1835
 
1839
1836
 &vop_mmu {