.. | .. |
---|
62 | 62 | |
---|
63 | 63 | mmc3_pwrseq: mmc3_pwrseq { |
---|
64 | 64 | compatible = "mmc-pwrseq-simple"; |
---|
65 | | - pinctrl-names = "default"; |
---|
66 | | - pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>; |
---|
67 | 65 | reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */ |
---|
68 | 66 | }; |
---|
69 | 67 | }; |
---|
.. | .. |
---|
82 | 80 | |
---|
83 | 81 | &gmac { |
---|
84 | 82 | pinctrl-names = "default"; |
---|
85 | | - pinctrl-0 = <&gmac_pins_rgmii_a>; |
---|
86 | | - phy = <&phy1>; |
---|
| 83 | + pinctrl-0 = <&gmac_rgmii_pins>; |
---|
| 84 | + phy-handle = <&phy1>; |
---|
87 | 85 | phy-mode = "rgmii"; |
---|
88 | 86 | status = "okay"; |
---|
89 | | - |
---|
90 | | - phy1: ethernet-phy@1 { |
---|
91 | | - reg = <1>; |
---|
92 | | - }; |
---|
93 | 87 | }; |
---|
94 | 88 | |
---|
95 | 89 | &i2c0 { |
---|
96 | | - pinctrl-names = "default"; |
---|
97 | | - pinctrl-0 = <&i2c0_pins_a>; |
---|
98 | 90 | status = "okay"; |
---|
99 | 91 | |
---|
100 | 92 | axp209: pmic@34 { |
---|
.. | .. |
---|
105 | 97 | }; |
---|
106 | 98 | |
---|
107 | 99 | &i2c1 { |
---|
108 | | - pinctrl-names = "default"; |
---|
109 | | - pinctrl-0 = <&i2c1_pins_a>; |
---|
110 | 100 | status = "okay"; |
---|
111 | 101 | }; |
---|
112 | 102 | |
---|
113 | 103 | &i2c2 { |
---|
114 | | - pinctrl-names = "default"; |
---|
115 | | - pinctrl-0 = <&i2c2_pins_a>; |
---|
116 | 104 | status = "okay"; |
---|
117 | 105 | }; |
---|
118 | 106 | |
---|
119 | 107 | #include "axp209.dtsi" |
---|
120 | 108 | |
---|
| 109 | +&gmac_mdio { |
---|
| 110 | + phy1: ethernet-phy@1 { |
---|
| 111 | + reg = <1>; |
---|
| 112 | + }; |
---|
| 113 | +}; |
---|
| 114 | + |
---|
121 | 115 | &mmc0 { |
---|
122 | | - pinctrl-names = "default"; |
---|
123 | | - pinctrl-0 = <&mmc0_pins_a>; |
---|
124 | 116 | vmmc-supply = <®_vcc3v3>; |
---|
125 | 117 | bus-width = <4>; |
---|
126 | 118 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ |
---|
.. | .. |
---|
128 | 120 | }; |
---|
129 | 121 | |
---|
130 | 122 | &mmc3 { |
---|
131 | | - pinctrl-names = "default"; |
---|
132 | | - pinctrl-0 = <&mmc3_pins_a>; |
---|
133 | 123 | vmmc-supply = <®_vcc3v3>; |
---|
134 | 124 | mmc-pwrseq = <&mmc3_pwrseq>; |
---|
135 | 125 | bus-width = <4>; |
---|
.. | .. |
---|
155 | 145 | |
---|
156 | 146 | &otg_sram { |
---|
157 | 147 | status = "okay"; |
---|
158 | | -}; |
---|
159 | | - |
---|
160 | | -&pio { |
---|
161 | | - vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin@0 { |
---|
162 | | - pins = "PH9"; |
---|
163 | | - function = "gpio_out"; |
---|
164 | | - }; |
---|
165 | | - |
---|
166 | | - usb0_id_detect_pin: usb0_id_detect_pin@0 { |
---|
167 | | - pins = "PH4"; |
---|
168 | | - function = "gpio_in"; |
---|
169 | | - bias-pull-up; |
---|
170 | | - }; |
---|
171 | 148 | }; |
---|
172 | 149 | |
---|
173 | 150 | ®_dcdc2 { |
---|
.. | .. |
---|
209 | 186 | |
---|
210 | 187 | &uart0 { |
---|
211 | 188 | pinctrl-names = "default"; |
---|
212 | | - pinctrl-0 = <&uart0_pins_a>; |
---|
| 189 | + pinctrl-0 = <&uart0_pb_pins>; |
---|
213 | 190 | status = "okay"; |
---|
214 | 191 | }; |
---|
215 | 192 | |
---|
.. | .. |
---|
223 | 200 | }; |
---|
224 | 201 | |
---|
225 | 202 | &usbphy { |
---|
226 | | - pinctrl-names = "default"; |
---|
227 | | - pinctrl-0 = <&usb0_id_detect_pin>; |
---|
228 | | - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ |
---|
| 203 | + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ |
---|
229 | 204 | usb0_vbus_power-supply = <&usb_power_supply>; |
---|
230 | 205 | usb0_vbus-supply = <®_usb0_vbus>; |
---|
231 | 206 | usb1_vbus-supply = <®_usb1_vbus>; |
---|