修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
..
..
@@ -61,8 +61,6 @@
61
61
 
62
62
 	leds {
63
63
 		compatible = "gpio-leds";
64
-		pinctrl-names = "default";
65
-		pinctrl-0 = <&led_pins_i12_tvbox>;
66
64
 
67
65
 		red {
68
66
 			label = "i12_tvbox:red:usr";
..
..
@@ -77,8 +75,6 @@
77
75
 
78
76
 	reg_vmmc3: vmmc3 {
79
77
 		compatible = "regulator-fixed";
80
-		pinctrl-names = "default";
81
-		pinctrl-0 = <&vmmc3_pin_i12_tvbox>;
82
78
 		regulator-name = "vmmc3";
83
79
 		regulator-min-microvolt = <3300000>;
84
80
 		regulator-max-microvolt = <3300000>;
..
..
@@ -88,8 +84,6 @@
88
84
 
89
85
 	reg_vmmc3_io: vmmc3-io {
90
86
 		compatible = "regulator-fixed";
91
-		pinctrl-names = "default";
92
-		pinctrl-0 = <&vmmc3_io_pin_i12_tvbox>;
93
87
 		regulator-name = "vmmc3-io";
94
88
 		regulator-min-microvolt = <3300000>;
95
89
 		regulator-max-microvolt = <3300000>;
..
..
@@ -101,8 +95,6 @@
101
95
 
102
96
 	reg_gmac_3v3: gmac-3v3 {
103
97
 		compatible = "regulator-fixed";
104
-		pinctrl-names = "default";
105
-		pinctrl-0 = <&gmac_power_pin_i12_tvbox>;
106
98
 		regulator-name = "gmac-3v3";
107
99
 		regulator-min-microvolt = <3300000>;
108
100
 		regulator-max-microvolt = <3300000>;
..
..
@@ -122,20 +114,14 @@
122
114
 
123
115
 &gmac {
124
116
 	pinctrl-names = "default";
125
-	pinctrl-0 = <&gmac_pins_mii_a>;
126
-	phy = <&phy1>;
117
+	pinctrl-0 = <&gmac_mii_pins>;
118
+	phy-handle = <&phy1>;
127
119
 	phy-mode = "mii";
128
120
 	phy-supply = <&reg_gmac_3v3>;
129
121
 	status = "okay";
130
-
131
-	phy1: ethernet-phy@1 {
132
-		reg = <1>;
133
-	};
134
122
 };
135
123
 
136
124
 &i2c0 {
137
-	pinctrl-names = "default";
138
-	pinctrl-0 = <&i2c0_pins_a>;
139
125
 	status = "okay";
140
126
 
141
127
 	axp209: pmic@34 {
..
..
@@ -151,13 +137,17 @@
151
137
 
152
138
 &ir0 {
153
139
 	pinctrl-names = "default";
154
-	pinctrl-0 = <&ir0_rx_pins_a>;
140
+	pinctrl-0 = <&ir0_rx_pin>;
155
141
 	status = "okay";
156
142
 };
157
143
 
144
+&gmac_mdio {
145
+	phy1: ethernet-phy@1 {
146
+		reg = <1>;
147
+	};
148
+};
149
+
158
150
 &mmc0 {
159
-	pinctrl-names = "default";
160
-	pinctrl-0 = <&mmc0_pins_a>;
161
151
 	vmmc-supply = <&reg_vcc3v3>;
162
152
 	bus-width = <4>;
163
153
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -165,8 +155,6 @@
165
155
 };
166
156
 
167
157
 &mmc3 {
168
-	pinctrl-names = "default";
169
-	pinctrl-0 = <&mmc3_pins_a>;
170
158
 	vmmc-supply = <&reg_vmmc3>;
171
159
 	bus-width = <4>;
172
160
 	non-removable;
..
..
@@ -181,39 +169,12 @@
181
169
 	};
182
170
 };
183
171
 
184
-&mmc3_pins_a {
185
-	/* AP6210 / AP6330 requires pull-up */
186
-	bias-pull-up;
187
-};
188
-
189
172
 &ohci0 {
190
173
 	status = "okay";
191
174
 };
192
175
 
193
176
 &ohci1 {
194
177
 	status = "okay";
195
-};
196
-
197
-&pio {
198
-	vmmc3_pin_i12_tvbox: vmmc3_pin@0 {
199
-		pins = "PH2";
200
-		function = "gpio_out";
201
-	};
202
-
203
-	vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 {
204
-		pins = "PH12";
205
-		function = "gpio_out";
206
-	};
207
-
208
-	gmac_power_pin_i12_tvbox: gmac_power_pin@0 {
209
-		pins = "PH21";
210
-		function = "gpio_out";
211
-	};
212
-
213
-	led_pins_i12_tvbox: led_pins@0 {
214
-		pins = "PH9", "PH20";
215
-		function = "gpio_out";
216
-	};
217
178
 };
218
179
 
219
180
 &reg_usb1_vbus {
..
..
@@ -226,7 +187,7 @@
226
187
 
227
188
 &uart0 {
228
189
 	pinctrl-names = "default";
229
-	pinctrl-0 = <&uart0_pins_a>;
190
+	pinctrl-0 = <&uart0_pb_pins>;
230
191
 	status = "okay";
231
192
 };
232
193