.. | .. |
---|
112 | 112 | }; |
---|
113 | 113 | |
---|
114 | 114 | &emac { |
---|
115 | | - phy = <&phy1>; |
---|
| 115 | + phy-handle = <&phy1>; |
---|
116 | 116 | status = "okay"; |
---|
117 | 117 | }; |
---|
118 | 118 | |
---|
.. | .. |
---|
186 | 186 | function = "gpio_out"; |
---|
187 | 187 | drive-strength = <20>; |
---|
188 | 188 | }; |
---|
189 | | - |
---|
190 | | - usb0_id_detect_pin: usb0-id-detect-pin { |
---|
191 | | - pins = "PH4"; |
---|
192 | | - function = "gpio_in"; |
---|
193 | | - bias-pull-up; |
---|
194 | | - }; |
---|
195 | | - |
---|
196 | | - usb0_vbus_detect_pin: usb0-vbus-detect-pin { |
---|
197 | | - pins = "PH5"; |
---|
198 | | - function = "gpio_in"; |
---|
199 | | - bias-pull-down; |
---|
200 | | - }; |
---|
201 | 189 | }; |
---|
202 | 190 | |
---|
203 | 191 | ®_ahci_5v { |
---|
.. | .. |
---|
229 | 217 | }; |
---|
230 | 218 | |
---|
231 | 219 | &usbphy { |
---|
232 | | - pinctrl-names = "default"; |
---|
233 | | - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; |
---|
234 | | - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ |
---|
235 | | - usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ |
---|
| 220 | + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ |
---|
| 221 | + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */ |
---|
236 | 222 | usb0_vbus-supply = <®_usb0_vbus>; |
---|
237 | 223 | usb1_vbus-supply = <®_usb1_vbus>; |
---|
238 | 224 | usb2_vbus-supply = <®_usb2_vbus>; |
---|