hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun6i-a31-m9.dts
....@@ -60,8 +60,6 @@
6060
6161 leds {
6262 compatible = "gpio-leds";
63
- pinctrl-names = "default";
64
- pinctrl-0 = <&led_pins_m9>;
6563
6664 blue {
6765 label = "m9:blue:pwr";
....@@ -85,26 +83,26 @@
8583
8684 &gmac {
8785 pinctrl-names = "default";
88
- pinctrl-0 = <&gmac_pins_mii_a>;
89
- phy = <&phy1>;
86
+ pinctrl-0 = <&gmac_mii_pins>;
87
+ phy-handle = <&phy1>;
9088 phy-mode = "mii";
9189 phy-supply = <&reg_dldo1>;
9290 status = "okay";
91
+};
9392
93
+&ir {
94
+ pinctrl-names = "default";
95
+ pinctrl-0 = <&s_ir_rx_pin>;
96
+ status = "okay";
97
+};
98
+
99
+&mdio {
94100 phy1: ethernet-phy@1 {
95101 reg = <1>;
96102 };
97103 };
98104
99
-&ir {
100
- pinctrl-names = "default";
101
- pinctrl-0 = <&ir_pins_a>;
102
- status = "okay";
103
-};
104
-
105105 &mmc0 {
106
- pinctrl-names = "default";
107
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
108106 vmmc-supply = <&reg_dcdc1>;
109107 bus-width = <4>;
110108 cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
....@@ -123,24 +121,6 @@
123121 };
124122
125123 #include "axp22x.dtsi"
126
-
127
-&pio {
128
- led_pins_m9: led_pins@0 {
129
- pins = "PH13";
130
- function = "gpio_out";
131
- };
132
-
133
- mmc0_cd_pin_m9: mmc0_cd_pin@0 {
134
- pins = "PH22";
135
- function = "gpio_in";
136
- bias-pull-up;
137
- };
138
-
139
- usb1_vbus_pin_m9: usb1_vbus_pin@0 {
140
- pins = "PC27";
141
- function = "gpio_out";
142
- };
143
-};
144124
145125 &reg_aldo1 {
146126 regulator-min-microvolt = <3300000>;
....@@ -215,15 +195,13 @@
215195 };
216196
217197 &reg_usb1_vbus {
218
- pinctrl-names = "default";
219
- pinctrl-0 = <&usb1_vbus_pin_m9>;
220198 gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
221199 status = "okay";
222200 };
223201
224202 &uart0 {
225203 pinctrl-names = "default";
226
- pinctrl-0 = <&uart0_pins_a>;
204
+ pinctrl-0 = <&uart0_ph_pins>;
227205 status = "okay";
228206 };
229207