修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/pxa910.dtsi
..
..
@@ -1,16 +1,15 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  *  Copyright (C) 2012 Marvell Technology Group Ltd.
3
4
  *  Author: Haojian Zhuang <haojian.zhuang@marvell.com>
4
- *
5
- *  This program is free software; you can redistribute it and/or modify
6
- *  it under the terms of the GNU General Public License version 2 as
7
- *  publishhed by the Free Software Foundation.
8
5
  */
9
6
 
10
-#include "skeleton.dtsi"
11
7
 #include <dt-bindings/clock/marvell,pxa910.h>
12
8
 
13
9
 / {
10
+	#address-cells = <1>;
11
+	#size-cells = <1>;
12
+
14
13
 	aliases {
15
14
 		serial0 = &uart1;
16
15
 		serial1 = &uart2;
..
..
@@ -68,27 +67,30 @@
68
67
 				status = "disabled";
69
68
 			};
70
69
 
71
-			uart1: uart@d4017000 {
72
-				compatible = "mrvl,mmp-uart";
70
+			uart1: serial@d4017000 {
71
+				compatible = "mrvl,mmp-uart", "intel,xscale-uart";
73
72
 				reg = <0xd4017000 0x1000>;
73
+				reg-shift = <2>;
74
74
 				interrupts = <27>;
75
75
 				clocks = <&soc_clocks PXA910_CLK_UART0>;
76
76
 				resets = <&soc_clocks PXA910_CLK_UART0>;
77
77
 				status = "disabled";
78
78
 			};
79
79
 
80
-			uart2: uart@d4018000 {
81
-				compatible = "mrvl,mmp-uart";
80
+			uart2: serial@d4018000 {
81
+				compatible = "mrvl,mmp-uart", "intel,xscale-uart";
82
82
 				reg = <0xd4018000 0x1000>;
83
+				reg-shift = <2>;
83
84
 				interrupts = <28>;
84
85
 				clocks = <&soc_clocks PXA910_CLK_UART1>;
85
86
 				resets = <&soc_clocks PXA910_CLK_UART1>;
86
87
 				status = "disabled";
87
88
 			};
88
89
 
89
-			uart3: uart@d4036000 {
90
-				compatible = "mrvl,mmp-uart";
90
+			uart3: serial@d4036000 {
91
+				compatible = "mrvl,mmp-uart", "intel,xscale-uart";
91
92
 				reg = <0xd4036000 0x1000>;
93
+				reg-shift = <2>;
92
94
 				interrupts = <59>;
93
95
 				clocks = <&soc_clocks PXA910_CLK_UART2>;
94
96
 				resets = <&soc_clocks PXA910_CLK_UART2>;
..
..
@@ -107,7 +109,7 @@
107
109
 				clocks = <&soc_clocks PXA910_CLK_GPIO>;
108
110
 				resets = <&soc_clocks PXA910_CLK_GPIO>;
109
111
 				interrupt-controller;
110
-				#interrupt-cells = <1>;
112
+				#interrupt-cells = <2>;
111
113
 				ranges;
112
114
 
113
115
 				gcb0: gpio@d4019000 {
..
..
@@ -153,7 +155,7 @@
153
155
 			rtc: rtc@d4010000 {
154
156
 				compatible = "mrvl,mmp-rtc";
155
157
 				reg = <0xd4010000 0x1000>;
156
-				interrupts = <5 6>;
158
+				interrupts = <5>, <6>;
157
159
 				interrupt-names = "rtc 1Hz", "rtc alarm";
158
160
 				clocks = <&soc_clocks PXA910_CLK_RTC>;
159
161
 				resets = <&soc_clocks PXA910_CLK_RTC>;