hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun6i-a31-i7.dts
....@@ -71,8 +71,6 @@
7171
7272 leds {
7373 compatible = "gpio-leds";
74
- pinctrl-names = "default";
75
- pinctrl-0 = <&led_pins_i7>;
7674
7775 blue {
7876 label = "i7:blue:usr";
....@@ -118,14 +116,10 @@
118116
119117 &gmac {
120118 pinctrl-names = "default";
121
- pinctrl-0 = <&gmac_pins_mii_a>;
122
- phy = <&phy1>;
119
+ pinctrl-0 = <&gmac_mii_pins>;
120
+ phy-handle = <&phy1>;
123121 phy-mode = "mii";
124122 status = "okay";
125
-
126
- phy1: ethernet-phy@1 {
127
- reg = <1>;
128
- };
129123 };
130124
131125 &hdmi {
....@@ -140,48 +134,31 @@
140134
141135 &ir {
142136 pinctrl-names = "default";
143
- pinctrl-0 = <&ir_pins_a>;
137
+ pinctrl-0 = <&s_ir_rx_pin>;
144138 status = "okay";
145139 };
146140
141
+&mdio {
142
+ phy1: ethernet-phy@1 {
143
+ reg = <1>;
144
+ };
145
+};
146
+
147147 &mmc0 {
148
- pinctrl-names = "default";
149
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>;
150148 vmmc-supply = <&reg_vcc3v3>;
151149 bus-width = <4>;
152150 cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
153151 status = "okay";
154152 };
155153
156
-&pio {
157
- led_pins_i7: led_pins@0 {
158
- pins = "PH13";
159
- function = "gpio_out";
160
- };
161
-
162
- mmc0_cd_pin_i7: mmc0_cd_pin@0 {
163
- pins = "PH22";
164
- function = "gpio_in";
165
- bias-pull-up;
166
- };
167
-
168
- usb1_vbus_pin_i7: usb1_vbus_pin@0 {
169
- pins = "PC27";
170
- function = "gpio_out";
171
- };
172
-};
173
-
174154 &reg_usb1_vbus {
175
- pinctrl-names = "default";
176
- pinctrl-0 = <&usb1_vbus_pin_i7>;
177155 gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
178156 status = "okay";
179157 };
180158
181159 &spdif {
182160 pinctrl-names = "default";
183
- pinctrl-0 = <&spdif_pins_a>;
184
- spdif-out = "okay";
161
+ pinctrl-0 = <&spdif_tx_pin>;
185162 status = "okay";
186163 };
187164
....@@ -191,7 +168,7 @@
191168
192169 &uart0 {
193170 pinctrl-names = "default";
194
- pinctrl-0 = <&uart0_pins_a>;
171
+ pinctrl-0 = <&uart0_ph_pins>;
195172 status = "okay";
196173 };
197174