forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
....@@ -78,7 +78,7 @@
7878
7979 &can0 {
8080 pinctrl-names = "default";
81
- pinctrl-0 = <&can0_pins_a>;
81
+ pinctrl-0 = <&can_ph_pins>;
8282 status = "okay";
8383 };
8484
....@@ -104,19 +104,11 @@
104104
105105 &gmac {
106106 pinctrl-names = "default";
107
- pinctrl-0 = <&gmac_pins_rgmii_a>;
108
- phy = <&phy3>;
107
+ pinctrl-0 = <&gmac_rgmii_pins>;
108
+ phy-handle = <&phy3>;
109109 phy-mode = "rgmii";
110110 phy-supply = <&reg_vcc3v3>;
111
-
112
- snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
113
- snps,reset-active-low;
114
- snps,reset-delays-us = <0 10000 1000000>;
115111 status = "okay";
116
-
117
- phy3: ethernet-phy@3 {
118
- reg = <3>;
119
- };
120112 };
121113
122114 &hdmi {
....@@ -130,8 +122,6 @@
130122 };
131123
132124 &i2c0 {
133
- pinctrl-names = "default";
134
- pinctrl-0 = <&i2c0_pins_a>;
135125 status = "okay";
136126
137127 axp209: pmic@34 {
....@@ -143,8 +133,6 @@
143133
144134 /* Exposed to UEXT1 */
145135 &i2c1 {
146
- pinctrl-names = "default";
147
- pinctrl-0 = <&i2c1_pins_a>;
148136 status = "okay";
149137
150138 eeprom: eeprom@50 {
....@@ -156,20 +144,26 @@
156144
157145 /* Exposed to UEXT2 */
158146 &i2c2 {
159
- pinctrl-names = "default";
160
- pinctrl-0 = <&i2c2_pins_a>;
161147 status = "okay";
162148 };
163149
164150 &ir0 {
165151 pinctrl-names = "default";
166
- pinctrl-0 = <&ir0_rx_pins_a>;
152
+ pinctrl-0 = <&ir0_rx_pin>;
167153 status = "okay";
168154 };
169155
156
+&gmac_mdio {
157
+ phy3: ethernet-phy@3 {
158
+ reg = <3>;
159
+ reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
160
+ reset-assert-us = <10000>;
161
+ /* wait 1s after reset, otherwise fail to read phy id */
162
+ reset-deassert-us = <1000000>;
163
+ };
164
+};
165
+
170166 &mmc0 {
171
- pinctrl-names = "default";
172
- pinctrl-0 = <&mmc0_pins_a>;
173167 vmmc-supply = <&reg_vcc3v3>;
174168 bus-width = <4>;
175169 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
....@@ -177,8 +171,6 @@
177171 };
178172
179173 &mmc3 {
180
- pinctrl-names = "default";
181
- pinctrl-0 = <&mmc3_pins_a>;
182174 vmmc-supply = <&reg_vcc3v3>;
183175 mmc-pwrseq = <&rtl_pwrseq>;
184176 bus-width = <4>;
....@@ -203,8 +195,8 @@
203195 };
204196
205197 &pio {
206
- bt_uart_pins: bt_uart_pins@0 {
207
- pins = "PG6", "PG7", "PG8";
198
+ uart3_rts_pin: uart3-rts-pin {
199
+ pins = "PG8";
208200 function = "uart3";
209201 };
210202 };
....@@ -274,43 +266,43 @@
274266 /* Exposed to UEXT1 */
275267 &spi1 {
276268 pinctrl-names = "default";
277
- pinctrl-0 = <&spi1_pins_a>,
278
- <&spi1_cs0_pins_a>;
269
+ pinctrl-0 = <&spi1_pi_pins>,
270
+ <&spi1_cs0_pi_pin>;
279271 status = "okay";
280272 };
281273
282274 /* Exposed to UEXT2 */
283275 &spi2 {
284276 pinctrl-names = "default";
285
- pinctrl-0 = <&spi2_pins_a>,
286
- <&spi2_cs0_pins_a>;
277
+ pinctrl-0 = <&spi2_pc_pins>,
278
+ <&spi2_cs0_pc_pin>;
287279 status = "okay";
288280 };
289281
290282 &uart0 {
291283 pinctrl-names = "default";
292
- pinctrl-0 = <&uart0_pins_a>;
284
+ pinctrl-0 = <&uart0_pb_pins>;
293285 status = "okay";
294286 };
295287
296288 /* Used for RTL8723BS bluetooth */
297289 &uart3 {
298290 pinctrl-names = "default";
299
- pinctrl-0 = <&bt_uart_pins>;
291
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_pin>;
300292 status = "okay";
301293 };
302294
303295 /* Exposed to UEXT1 */
304296 &uart4 {
305297 pinctrl-names = "default";
306
- pinctrl-0 = <&uart4_pins_a>;
298
+ pinctrl-0 = <&uart4_pg_pins>;
307299 status = "okay";
308300 };
309301
310302 /* Exposed to UEXT2 */
311303 &uart7 {
312304 pinctrl-names = "default";
313
- pinctrl-0 = <&uart7_pins_a>;
305
+ pinctrl-0 = <&uart7_pi_pins>;
314306 status = "okay";
315307 };
316308
....@@ -324,8 +316,8 @@
324316 };
325317
326318 &usbphy {
327
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
328
- usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
319
+ usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
320
+ usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
329321 usb0_vbus_power-supply = <&usb_power_supply>;
330322 usb0_vbus-supply = <&reg_usb0_vbus>;
331323 usb1_vbus-supply = <&reg_usb1_vbus>;