forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
....@@ -74,8 +74,6 @@
7474
7575 leds {
7676 compatible = "gpio-leds";
77
- pinctrl-names = "default";
78
- pinctrl-0 = <&led_pins_olimex_som_evb>;
7977
8078 green {
8179 label = "a20-olimex-som-evb:green:usr";
....@@ -112,14 +110,10 @@
112110
113111 &gmac {
114112 pinctrl-names = "default";
115
- pinctrl-0 = <&gmac_pins_rgmii_a>;
116
- phy = <&phy1>;
113
+ pinctrl-0 = <&gmac_rgmii_pins>;
114
+ phy-handle = <&phy1>;
117115 phy-mode = "rgmii";
118116 status = "okay";
119
-
120
- phy1: ethernet-phy@1 {
121
- reg = <1>;
122
- };
123117 };
124118
125119 &hdmi {
....@@ -133,8 +127,6 @@
133127 };
134128
135129 &i2c0 {
136
- pinctrl-names = "default";
137
- pinctrl-0 = <&i2c0_pins_a>;
138130 status = "okay";
139131
140132 axp209: pmic@34 {
....@@ -145,14 +137,10 @@
145137 };
146138
147139 &i2c1 {
148
- pinctrl-names = "default";
149
- pinctrl-0 = <&i2c1_pins_a>;
150140 status = "okay";
151141 };
152142
153143 &i2c2 {
154
- pinctrl-names = "default";
155
- pinctrl-0 = <&i2c2_pins_a>;
156144 status = "okay";
157145 };
158146
....@@ -160,49 +148,49 @@
160148 vref-supply = <&reg_vcc3v0>;
161149 status = "okay";
162150
163
- button@190 {
151
+ button-190 {
164152 label = "Volume Up";
165153 linux,code = <KEY_VOLUMEUP>;
166154 channel = <0>;
167155 voltage = <190000>;
168156 };
169157
170
- button@390 {
158
+ button-390 {
171159 label = "Volume Down";
172160 linux,code = <KEY_VOLUMEDOWN>;
173161 channel = <0>;
174162 voltage = <390000>;
175163 };
176164
177
- button@600 {
165
+ button-600 {
178166 label = "Menu";
179167 linux,code = <KEY_MENU>;
180168 channel = <0>;
181169 voltage = <600000>;
182170 };
183171
184
- button@800 {
172
+ button-800 {
185173 label = "Search";
186174 linux,code = <KEY_SEARCH>;
187175 channel = <0>;
188176 voltage = <800000>;
189177 };
190178
191
- button@980 {
179
+ button-980 {
192180 label = "Home";
193181 linux,code = <KEY_HOMEPAGE>;
194182 channel = <0>;
195183 voltage = <980000>;
196184 };
197185
198
- button@1180 {
186
+ button-1180 {
199187 label = "Esc";
200188 linux,code = <KEY_ESC>;
201189 channel = <0>;
202190 voltage = <1180000>;
203191 };
204192
205
- button@1400 {
193
+ button-1400 {
206194 label = "Enter";
207195 linux,code = <KEY_ENTER>;
208196 channel = <0>;
....@@ -210,9 +198,13 @@
210198 };
211199 };
212200
201
+&gmac_mdio {
202
+ phy1: ethernet-phy@1 {
203
+ reg = <1>;
204
+ };
205
+};
206
+
213207 &mmc0 {
214
- pinctrl-names = "default";
215
- pinctrl-0 = <&mmc0_pins_a>;
216208 vmmc-supply = <&reg_vcc3v3>;
217209 bus-width = <4>;
218210 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -220,8 +212,6 @@
220212 };
221213
222214 &mmc3 {
223
- pinctrl-names = "default";
224
- pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;
225215 vmmc-supply = <&reg_vcc3v3>;
226216 bus-width = <4>;
227217 cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
....@@ -241,36 +231,14 @@
241231 };
242232
243233 &pio {
244
- ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 {
245
- pins = "PC3";
246
- function = "gpio_out";
247
- };
248
-
249
- led_pins_olimex_som_evb: led_pins@0 {
234
+ led_pins_olimex_som_evb: led-pins {
250235 pins = "PH2";
251236 function = "gpio_out";
252237 drive-strength = <20>;
253238 };
254
-
255
- mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
256
- pins = "PH0";
257
- function = "gpio_in";
258
- bias-pull-up;
259
- };
260
-
261
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
262
- pins = "PH4";
263
- function = "gpio_in";
264
- };
265
-
266
- usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
267
- pins = "PH5";
268
- function = "gpio_in";
269
- };
270239 };
271240
272241 &reg_ahci_5v {
273
- pinctrl-0 = <&ahci_pwr_pin_olimex_som_evb>;
274242 gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
275243 status = "okay";
276244 };
....@@ -316,33 +284,33 @@
316284
317285 &spi1 {
318286 pinctrl-names = "default";
319
- pinctrl-0 = <&spi1_pins_a>,
320
- <&spi1_cs0_pins_a>;
287
+ pinctrl-0 = <&spi1_pi_pins>,
288
+ <&spi1_cs0_pi_pin>;
321289 status = "okay";
322290 };
323291
324292 &spi2 {
325293 pinctrl-names = "default";
326
- pinctrl-0 = <&spi2_pins_a>,
327
- <&spi2_cs0_pins_a>;
294
+ pinctrl-0 = <&spi2_pc_pins>,
295
+ <&spi2_cs0_pc_pin>;
328296 status = "okay";
329297 };
330298
331299 &uart0 {
332300 pinctrl-names = "default";
333
- pinctrl-0 = <&uart0_pins_a>;
301
+ pinctrl-0 = <&uart0_pb_pins>;
334302 status = "okay";
335303 };
336304
337305 &uart6 {
338306 pinctrl-names = "default";
339
- pinctrl-0 = <&uart6_pins_a>;
307
+ pinctrl-0 = <&uart6_pi_pins>;
340308 status = "okay";
341309 };
342310
343311 &uart7 {
344312 pinctrl-names = "default";
345
- pinctrl-0 = <&uart7_pins_a>;
313
+ pinctrl-0 = <&uart7_pi_pins>;
346314 status = "okay";
347315 };
348316
....@@ -352,8 +320,6 @@
352320 };
353321
354322 &usbphy {
355
- pinctrl-names = "default";
356
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
357323 usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH04 */
358324 usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH05 */
359325 usb0_vbus-supply = <&reg_usb0_vbus>;