hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
....@@ -105,14 +105,10 @@
105105
106106 &gmac {
107107 pinctrl-names = "default";
108
- pinctrl-0 = <&gmac_pins_mii_a>;
109
- phy = <&phy1>;
108
+ pinctrl-0 = <&gmac_mii_pins>;
109
+ phy-handle = <&phy1>;
110110 phy-mode = "mii";
111111 status = "okay";
112
-
113
- phy1: ethernet-phy@1 {
114
- reg = <1>;
115
- };
116112 };
117113
118114 &hdmi {
....@@ -126,8 +122,6 @@
126122 };
127123
128124 &i2c0 {
129
- pinctrl-names = "default";
130
- pinctrl-0 = <&i2c0_pins_a>;
131125 status = "okay";
132126
133127 axp209: pmic@34 {
....@@ -142,8 +136,6 @@
142136 };
143137
144138 &i2c1 {
145
- pinctrl-names = "default";
146
- pinctrl-0 = <&i2c1_pins_a>;
147139 status = "okay";
148140
149141 eeprom: eeprom@50 {
....@@ -153,9 +145,13 @@
153145 };
154146 };
155147
148
+&gmac_mdio {
149
+ phy1: ethernet-phy@1 {
150
+ reg = <1>;
151
+ };
152
+};
153
+
156154 &mmc0 {
157
- pinctrl-names = "default";
158
- pinctrl-0 = <&mmc0_pins_a>;
159155 vmmc-supply = <&reg_vcc3v3>;
160156 bus-width = <4>;
161157 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -175,32 +171,14 @@
175171 };
176172
177173 &pio {
178
- ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
179
- pins = "PC3";
180
- function = "gpio_out";
181
- };
182
-
183
- led_pins_olinuxinolime: led_pins@0 {
174
+ led_pins_olinuxinolime: led-pins {
184175 pins = "PH2";
185176 function = "gpio_out";
186177 drive-strength = <20>;
187178 };
188
-
189
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
190
- pins = "PH4";
191
- function = "gpio_in";
192
- bias-pull-up;
193
- };
194
-
195
- usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
196
- pins = "PH5";
197
- function = "gpio_in";
198
- bias-pull-down;
199
- };
200179 };
201180
202181 &reg_ahci_5v {
203
- pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
204182 gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
205183 status = "okay";
206184 };
....@@ -219,7 +197,7 @@
219197
220198 &uart0 {
221199 pinctrl-names = "default";
222
- pinctrl-0 = <&uart0_pins_a>;
200
+ pinctrl-0 = <&uart0_pb_pins>;
223201 status = "okay";
224202 };
225203
....@@ -229,10 +207,8 @@
229207 };
230208
231209 &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 */
210
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
211
+ usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
236212 usb0_vbus-supply = <&reg_usb0_vbus>;
237213 usb1_vbus-supply = <&reg_usb1_vbus>;
238214 usb2_vbus-supply = <&reg_usb2_vbus>;