hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
....@@ -79,8 +79,6 @@
7979
8080 mmc0_pwrseq: mmc0_pwrseq {
8181 compatible = "mmc-pwrseq-simple";
82
- pinctrl-names = "default";
83
- pinctrl-0 = <&wifi_reg_on_pin_chip_pro>;
8482 reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
8583 };
8684 };
....@@ -94,8 +92,6 @@
9492 };
9593
9694 &i2c0 {
97
- pinctrl-names = "default";
98
- pinctrl-0 = <&i2c0_pins_a>;
9995 status = "okay";
10096
10197 axp209: pmic@34 {
....@@ -114,20 +110,16 @@
114110 #include "axp209.dtsi"
115111
116112 &i2c1 {
117
- pinctrl-names = "default";
118
- pinctrl-0 = <&i2c1_pins_a>;
119113 status = "disabled";
120114 };
121115
122116 &i2s0 {
123117 pinctrl-names = "default";
124
- pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
118
+ pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
125119 status = "disabled";
126120 };
127121
128122 &mmc0 {
129
- pinctrl-names = "default";
130
- pinctrl-0 = <&mmc0_pins_a>;
131123 vmmc-supply = <&reg_vcc3v3>;
132124 mmc-pwrseq = <&mmc0_pwrseq>;
133125 bus-width = <4>;
....@@ -137,12 +129,10 @@
137129
138130 &nfc {
139131 pinctrl-names = "default";
140
- pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
132
+ pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
141133 status = "okay";
142134
143135 nand@0 {
144
- #address-cells = <2>;
145
- #size-cells = <2>;
146136 reg = <0>;
147137 allwinner,rb = <0>;
148138 nand-ecc-mode = "hw";
....@@ -157,21 +147,9 @@
157147 status = "okay";
158148 };
159149
160
-&pio {
161
- usb0_id_pin_chip_pro: usb0-id-pin@0 {
162
- pins = "PG2";
163
- function = "gpio_in";
164
- };
165
-
166
- wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
167
- pins = "PB10";
168
- function = "gpio_out";
169
- };
170
-};
171
-
172150 &pwm {
173151 pinctrl-names = "default";
174
- pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
152
+ pinctrl-0 = <&pwm0_pin>, <&pwm1_pins>;
175153 status = "disabled";
176154 };
177155
....@@ -220,19 +198,19 @@
220198
221199 &uart1 {
222200 pinctrl-names = "default";
223
- pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
201
+ pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
224202 status = "okay";
225203 };
226204
227205 &uart2 {
228206 pinctrl-names = "default";
229
- pinctrl-0 = <&uart2_pins_a>, <&uart2_cts_rts_pins_a>;
207
+ pinctrl-0 = <&uart2_pd_pins>, <&uart2_cts_rts_pd_pins>;
230208 status = "disabled";
231209 };
232210
233211 &uart3 {
234212 pinctrl-names = "default";
235
- pinctrl-0 = <&uart3_pins_a>, <&uart3_cts_rts_pins_a>;
213
+ pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
236214 status = "okay";
237215 };
238216
....@@ -253,9 +231,7 @@
253231 };
254232
255233 &usbphy {
256
- pinctrl-names = "default";
257
- pinctrl-0 = <&usb0_id_pin_chip_pro>;
258
- usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
234
+ usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
259235 usb0_vbus_power-supply = <&usb_power_supply>;
260236 usb1_vbus-supply = <&reg_vcc5v0>;
261237 status = "okay";