hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
....@@ -62,8 +62,6 @@
6262
6363 mmc3_pwrseq: mmc3_pwrseq {
6464 compatible = "mmc-pwrseq-simple";
65
- pinctrl-names = "default";
66
- pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
6765 reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
6866 };
6967 };
....@@ -82,19 +80,13 @@
8280
8381 &gmac {
8482 pinctrl-names = "default";
85
- pinctrl-0 = <&gmac_pins_rgmii_a>;
86
- phy = <&phy1>;
83
+ pinctrl-0 = <&gmac_rgmii_pins>;
84
+ phy-handle = <&phy1>;
8785 phy-mode = "rgmii";
8886 status = "okay";
89
-
90
- phy1: ethernet-phy@1 {
91
- reg = <1>;
92
- };
9387 };
9488
9589 &i2c0 {
96
- pinctrl-names = "default";
97
- pinctrl-0 = <&i2c0_pins_a>;
9890 status = "okay";
9991
10092 axp209: pmic@34 {
....@@ -105,22 +97,22 @@
10597 };
10698
10799 &i2c1 {
108
- pinctrl-names = "default";
109
- pinctrl-0 = <&i2c1_pins_a>;
110100 status = "okay";
111101 };
112102
113103 &i2c2 {
114
- pinctrl-names = "default";
115
- pinctrl-0 = <&i2c2_pins_a>;
116104 status = "okay";
117105 };
118106
119107 #include "axp209.dtsi"
120108
109
+&gmac_mdio {
110
+ phy1: ethernet-phy@1 {
111
+ reg = <1>;
112
+ };
113
+};
114
+
121115 &mmc0 {
122
- pinctrl-names = "default";
123
- pinctrl-0 = <&mmc0_pins_a>;
124116 vmmc-supply = <&reg_vcc3v3>;
125117 bus-width = <4>;
126118 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -128,8 +120,6 @@
128120 };
129121
130122 &mmc3 {
131
- pinctrl-names = "default";
132
- pinctrl-0 = <&mmc3_pins_a>;
133123 vmmc-supply = <&reg_vcc3v3>;
134124 mmc-pwrseq = <&mmc3_pwrseq>;
135125 bus-width = <4>;
....@@ -155,19 +145,6 @@
155145
156146 &otg_sram {
157147 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
- };
171148 };
172149
173150 &reg_dcdc2 {
....@@ -209,7 +186,7 @@
209186
210187 &uart0 {
211188 pinctrl-names = "default";
212
- pinctrl-0 = <&uart0_pins_a>;
189
+ pinctrl-0 = <&uart0_pb_pins>;
213190 status = "okay";
214191 };
215192
....@@ -223,9 +200,7 @@
223200 };
224201
225202 &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 */
229204 usb0_vbus_power-supply = <&usb_power_supply>;
230205 usb0_vbus-supply = <&reg_usb0_vbus>;
231206 usb1_vbus-supply = <&reg_usb1_vbus>;