修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
..
..
@@ -1,15 +1,13 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
- * Copyright (C) 2014-2016 Texas Instruments Incorporated - http://www.ti.com/
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License version 2 as
6
- * published by the Free Software Foundation.
3
+ * Copyright (C) 2014-2016 Texas Instruments Incorporated - https://www.ti.com/
7
4
  */
8
5
 /dts-v1/;
9
6
 
10
-#include "dra74x.dtsi"
7
+#include "am5728.dtsi"
11
8
 #include "am57xx-commercial-grade.dtsi"
12
9
 #include "dra74x-mmc-iodelay.dtsi"
10
+#include "dra74-ipu-dsp-common.dtsi"
13
11
 #include <dt-bindings/gpio/gpio.h>
14
12
 #include <dt-bindings/interrupt-controller/irq.h>
15
13
 
..
..
@@ -51,6 +49,40 @@
51
49
 		vin-supply = <&main_12v0>;
52
50
 		regulator-always-on;
53
51
 		regulator-boot-on;
52
+	};
53
+
54
+	reserved-memory {
55
+		#address-cells = <2>;
56
+		#size-cells = <2>;
57
+		ranges;
58
+
59
+		ipu2_memory_region: ipu2-memory@95800000 {
60
+			compatible = "shared-dma-pool";
61
+			reg = <0x0 0x95800000 0x0 0x3800000>;
62
+			reusable;
63
+			status = "okay";
64
+		};
65
+
66
+		dsp1_memory_region: dsp1-memory@99000000 {
67
+			compatible = "shared-dma-pool";
68
+			reg = <0x0 0x99000000 0x0 0x4000000>;
69
+			reusable;
70
+			status = "okay";
71
+		};
72
+
73
+		ipu1_memory_region: ipu1-memory@9d000000 {
74
+			compatible = "shared-dma-pool";
75
+			reg = <0x0 0x9d000000 0x0 0x2000000>;
76
+			reusable;
77
+			status = "okay";
78
+		};
79
+
80
+		dsp2_memory_region: dsp2-memory@9f000000 {
81
+			compatible = "shared-dma-pool";
82
+			reg = <0x0 0x9f000000 0x0 0x800000>;
83
+			reusable;
84
+			status = "okay";
85
+		};
54
86
 	};
55
87
 
56
88
 	vdd_3v3: fixedregulator-vdd_3v3 {
..
..
@@ -403,7 +435,7 @@
403
435
 	};
404
436
 };
405
437
 
406
-&gpio7 {
438
+&gpio7_target {
407
439
 	ti,no-reset-on-init;
408
440
 	ti,no-idle-on-init;
409
441
 };
..
..
@@ -419,7 +451,7 @@
419
451
 			      <&dra7_pmx_core 0x3f8>;
420
452
 };
421
453
 
422
-&davinci_mdio {
454
+&davinci_mdio_sw {
423
455
 	phy0: ethernet-phy@1 {
424
456
 		reg = <1>;
425
457
 	};
..
..
@@ -429,21 +461,20 @@
429
461
 	};
430
462
 };
431
463
 
432
-&mac {
464
+&mac_sw {
433
465
 	status = "okay";
434
-	dual_emac;
435
466
 };
436
467
 
437
-&cpsw_emac0 {
468
+&cpsw_port1 {
438
469
 	phy-handle = <&phy0>;
439
-	phy-mode = "rgmii";
440
-	dual_emac_res_vlan = <1>;
470
+	phy-mode = "rgmii-rxid";
471
+	ti,dual-emac-pvid = <1>;
441
472
 };
442
473
 
443
-&cpsw_emac1 {
474
+&cpsw_port2 {
444
475
 	phy-handle = <&phy1>;
445
-	phy-mode = "rgmii";
446
-	dual_emac_res_vlan = <2>;
476
+	phy-mode = "rgmii-rxid";
477
+	ti,dual-emac-pvid = <2>;
447
478
 };
448
479
 
449
480
 &mmc1 {
..
..
@@ -550,13 +581,13 @@
550
581
 };
551
582
 
552
583
 &dss {
553
-	status = "ok";
584
+	status = "okay";
554
585
 
555
586
 	vdda_video-supply = <&ldoln_reg>;
556
587
 };
557
588
 
558
589
 &hdmi {
559
-	status = "ok";
590
+	status = "okay";
560
591
 	vdda-supply = <&ldo4_reg>;
561
592
 
562
593
 	port {
..
..
@@ -567,13 +598,13 @@
567
598
 };
568
599
 
569
600
 &pcie1_rc {
570
-	status = "ok";
601
+	status = "okay";
571
602
 	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
572
603
 };
573
604
 
574
605
 &mcasp3 {
575
606
 	#sound-dai-cells = <0>;
576
-	assigned-clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
607
+	assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
577
608
 	assigned-clock-parents = <&sys_clkin2>;
578
609
 	status = "okay";
579
610
 
..
..
@@ -587,22 +618,22 @@
587
618
 	rx-num-evt = <32>;
588
619
 };
589
620
 
590
-&mailbox5 {
621
+&ipu2 {
591
622
 	status = "okay";
592
-	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
593
-		status = "okay";
594
-	};
595
-	mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
596
-		status = "okay";
597
-	};
623
+	memory-region = <&ipu2_memory_region>;
598
624
 };
599
625
 
600
-&mailbox6 {
626
+&ipu1 {
601
627
 	status = "okay";
602
-	mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
603
-		status = "okay";
604
-	};
605
-	mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
606
-		status = "okay";
607
-	};
628
+	memory-region = <&ipu1_memory_region>;
629
+};
630
+
631
+&dsp1 {
632
+	status = "okay";
633
+	memory-region = <&dsp1_memory_region>;
634
+};
635
+
636
+&dsp2 {
637
+	status = "okay";
638
+	memory-region = <&dsp2_memory_region>;
608
639
 };