forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
....@@ -73,8 +73,6 @@
7373
7474 leds {
7575 compatible = "gpio-leds";
76
- pinctrl-names = "default";
77
- pinctrl-0 = <&led_pins_bpi_m1p>;
7876
7977 green {
8078 label = "bananapi-m1-plus:green:usr";
....@@ -90,15 +88,11 @@
9088
9189 mmc3_pwrseq: mmc3_pwrseq {
9290 compatible = "mmc-pwrseq-simple";
93
- pinctrl-names = "default";
94
- pinctrl-0 = <&mmc3_pwrseq_pin_bpi_m1p>;
9591 reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
9692 };
9793
9894 reg_gmac_3v3: gmac-3v3 {
9995 compatible = "regulator-fixed";
100
- pinctrl-names = "default";
101
- pinctrl-0 = <&gmac_power_pin_bpi_m1p>;
10296 regulator-name = "gmac-3v3";
10397 regulator-min-microvolt = <3300000>;
10498 regulator-max-microvolt = <3300000>;
....@@ -134,15 +128,11 @@
134128
135129 &gmac {
136130 pinctrl-names = "default";
137
- pinctrl-0 = <&gmac_pins_rgmii_a>;
138
- phy = <&phy1>;
139
- phy-mode = "rgmii";
131
+ pinctrl-0 = <&gmac_rgmii_pins>;
132
+ phy-handle = <&phy1>;
133
+ phy-mode = "rgmii-id";
140134 phy-supply = <&reg_gmac_3v3>;
141135 status = "okay";
142
-
143
- phy1: ethernet-phy@1 {
144
- reg = <1>;
145
- };
146136 };
147137
148138 &hdmi {
....@@ -156,8 +146,6 @@
156146 };
157147
158148 &i2c0 {
159
- pinctrl-names = "default";
160
- pinctrl-0 = <&i2c0_pins_a>;
161149 status = "okay";
162150
163151 axp209: pmic@34 {
....@@ -175,13 +163,17 @@
175163
176164 &ir0 {
177165 pinctrl-names = "default";
178
- pinctrl-0 = <&ir0_rx_pins_a>;
166
+ pinctrl-0 = <&ir0_rx_pin>;
179167 status = "okay";
180168 };
181169
170
+&gmac_mdio {
171
+ phy1: ethernet-phy@1 {
172
+ reg = <1>;
173
+ };
174
+};
175
+
182176 &mmc0 {
183
- pinctrl-names = "default";
184
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>;
185177 vmmc-supply = <&reg_vcc3v3>;
186178 bus-width = <4>;
187179 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
....@@ -191,8 +183,6 @@
191183 &mmc3 {
192184 #address-cells = <1>;
193185 #size-cells = <0>;
194
- pinctrl-names = "default";
195
- pinctrl-0 = <&mmc3_pins_a>;
196186 vmmc-supply = <&reg_vcc3v3>;
197187 mmc-pwrseq = <&mmc3_pwrseq>;
198188 bus-width = <4>;
....@@ -209,11 +199,6 @@
209199 };
210200 };
211201
212
-&mmc3_pins_a {
213
- /* AP6210 requires pull-up */
214
- bias-pull-up;
215
-};
216
-
217202 &ohci0 {
218203 status = "okay";
219204 };
....@@ -224,29 +209,6 @@
224209
225210 &otg_sram {
226211 status = "okay";
227
-};
228
-
229
-&pio {
230
- gmac_power_pin_bpi_m1p: gmac_power_pin@0 {
231
- pins = "PH23";
232
- function = "gpio_out";
233
- };
234
-
235
- led_pins_bpi_m1p: led_pins@0 {
236
- pins = "PH24", "PH25";
237
- function = "gpio_out";
238
- };
239
-
240
- mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
241
- pins = "PH10";
242
- function = "gpio_in";
243
- bias-pull-up;
244
- };
245
-
246
- mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {
247
- pins = "PH22";
248
- function = "gpio_out";
249
- };
250212 };
251213
252214 &reg_dcdc2 {
....@@ -280,7 +242,7 @@
280242
281243 &uart0 {
282244 pinctrl-names = "default";
283
- pinctrl-0 = <&uart0_pins_a>;
245
+ pinctrl-0 = <&uart0_pb_pins>;
284246 status = "okay";
285247 };
286248