change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/boot/dts/sun6i-a31-i7.dts
..
..
@@ -71,8 +71,6 @@
71
71
 
72
72
 	leds {
73
73
 		compatible = "gpio-leds";
74
-		pinctrl-names = "default";
75
-		pinctrl-0 = <&led_pins_i7>;
76
74
 
77
75
 		blue {
78
76
 			label = "i7:blue:usr";
..
..
@@ -118,14 +116,10 @@
118
116
 
119
117
 &gmac {
120
118
 	pinctrl-names = "default";
121
-	pinctrl-0 = <&gmac_pins_mii_a>;
122
-	phy = <&phy1>;
119
+	pinctrl-0 = <&gmac_mii_pins>;
120
+	phy-handle = <&phy1>;
123
121
 	phy-mode = "mii";
124
122
 	status = "okay";
125
-
126
-	phy1: ethernet-phy@1 {
127
-		reg = <1>;
128
-	};
129
123
 };
130
124
 
131
125
 &hdmi {
..
..
@@ -140,48 +134,31 @@
140
134
 
141
135
 &ir {
142
136
 	pinctrl-names = "default";
143
-	pinctrl-0 = <&ir_pins_a>;
137
+	pinctrl-0 = <&s_ir_rx_pin>;
144
138
 	status = "okay";
145
139
 };
146
140
 
141
+&mdio {
142
+	phy1: ethernet-phy@1 {
143
+		reg = <1>;
144
+	};
145
+};
146
+
147
147
 &mmc0 {
148
-	pinctrl-names = "default";
149
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>;
150
148
 	vmmc-supply = <&reg_vcc3v3>;
151
149
 	bus-width = <4>;
152
150
 	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
153
151
 	status = "okay";
154
152
 };
155
153
 
156
-&pio {
157
-	led_pins_i7: led_pins@0 {
158
-		pins = "PH13";
159
-		function = "gpio_out";
160
-	};
161
-
162
-	mmc0_cd_pin_i7: mmc0_cd_pin@0 {
163
-		pins = "PH22";
164
-		function = "gpio_in";
165
-		bias-pull-up;
166
-	};
167
-
168
-	usb1_vbus_pin_i7: usb1_vbus_pin@0 {
169
-		pins = "PC27";
170
-		function = "gpio_out";
171
-	};
172
-};
173
-
174
154
 &reg_usb1_vbus {
175
-	pinctrl-names = "default";
176
-	pinctrl-0 = <&usb1_vbus_pin_i7>;
177
155
 	gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
178
156
 	status = "okay";
179
157
 };
180
158
 
181
159
 &spdif {
182
160
 	pinctrl-names = "default";
183
-	pinctrl-0 = <&spdif_pins_a>;
184
-	spdif-out = "okay";
161
+	pinctrl-0 = <&spdif_tx_pin>;
185
162
 	status = "okay";
186
163
 };
187
164
 
..
..
@@ -191,7 +168,7 @@
191
168
 
192
169
 &uart0 {
193
170
 	pinctrl-names = "default";
194
-	pinctrl-0 = <&uart0_pins_a>;
171
+	pinctrl-0 = <&uart0_ph_pins>;
195
172
 	status = "okay";
196
173
 };
197
174