add r8169 read mac form eeprom

hc

2023-11-20 69d6da3c1c63675524a25e7dc92a4f43c4164cef

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
old mode 100644new mode 100755
..
..
@@ -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 {
..
..
@@ -326,7 +345,7 @@
326
345
 		 * - PDN (power down when low)
327
346
 		 */
328
347
 		post-power-on-delay-ms = <200>;
329
-		reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
348
+		reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
330
349
 	};
331
350
 
332
351
 	wireless_wlan: wireless-wlan {
..
..
@@ -1103,7 +1122,6 @@
1103
1122
 		regulator-min-microvolt = <712500>;
1104
1123
 		regulator-max-microvolt = <1390000>;
1105
1124
 		regulator-init-microvolt = <900000>;
1106
-		regulator-initial-mode = <1>;
1107
1125
 		regulator-ramp-delay = <2300>;
1108
1126
 		fcs,suspend-voltage-selector = <1>;
1109
1127
 		regulator-boot-on;
..
..
@@ -1265,8 +1283,8 @@
1265
1283
 			vccio_acodec: LDO_REG4 {
1266
1284
 				regulator-always-on;
1267
1285
 				regulator-boot-on;
1268
-				regulator-min-microvolt = <3300000>;
1269
-				regulator-max-microvolt = <3300000>;
1286
+				regulator-min-microvolt = <3000000>;
1287
+				regulator-max-microvolt = <3000000>;
1270
1288
 				regulator-name = "vccio_acodec";
1271
1289
 				regulator-state-mem {
1272
1290
 					regulator-off-in-suspend;
..
..
@@ -1380,15 +1398,6 @@
1380
1398
 
1381
1399
 &i2c1 {
1382
1400
 	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
1401
 };
1393
1402
 
1394
1403
 &i2c5 {
..
..
@@ -1421,6 +1430,12 @@
1421
1430
 		     &i2s1m0_lrcktx
1422
1431
 		     &i2s1m0_sdi0
1423
1432
 		     &i2s1m0_sdo0>;
1433
+};
1434
+
1435
+&i2s3_2ch {
1436
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1437
+	rockchip,bclk-fs = <32>;
1438
+	status = "disabled";
1424
1439
 };
1425
1440
 
1426
1441
 &iep {
..
..
@@ -1458,6 +1473,12 @@
1458
1473
 };
1459
1474
 
1460
1475
 &pinctrl {
1476
+
1477
+	headphone {
1478
+		hp_det: hp-det {
1479
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1480
+		};
1481
+	};
1461
1482
 
1462
1483
 	mxc6655xa {
1463
1484
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
..
..
@@ -1497,7 +1518,7 @@
1497
1518
 
1498
1519
 	sdio-pwrseq {
1499
1520
 		wifi_enable_h: wifi-enable-h {
1500
-			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
1521
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1501
1522
 		};
1502
1523
 	};
1503
1524
 
..
..
@@ -1546,6 +1567,10 @@
1546
1567
 };
1547
1568
 
1548
1569
 &pwm4 {
1570
+	status = "okay";
1571
+};
1572
+
1573
+&pwm6 {
1549
1574
 	status = "okay";
1550
1575
 };
1551
1576
 
..
..
@@ -1820,8 +1845,8 @@
1820
1845
 
1821
1846
 &vop {
1822
1847
 	status = "okay";
1823
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1824
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1848
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1849
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
1825
1850
 };
1826
1851
 
1827
1852
 &vop_mmu {