hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun8i-r16-parrot.dts
....@@ -63,8 +63,6 @@
6363
6464 leds {
6565 compatible = "gpio-leds";
66
- pinctrl-names = "default";
67
- pinctrl-0 = <&led_pins_parrot>;
6866
6967 led1 {
7068 label = "parrot:led1:usr";
....@@ -97,8 +95,6 @@
9795 };
9896
9997 &i2c1 {
100
- pinctrl-names = "default";
101
- pinctrl-0 = <&i2c1_pins_a>;
10298 status = "okay";
10399
104100 /*
....@@ -111,14 +107,14 @@
111107 vref-supply = <&reg_aldo3>;
112108 status = "okay";
113109
114
- button@0 {
110
+ button-190 {
115111 label = "V+";
116112 linux,code = <KEY_VOLUMEUP>;
117113 channel = <0>;
118114 voltage = <190000>;
119115 };
120116
121
- button@1 {
117
+ button-390 {
122118 label = "V-";
123119 linux,code = <KEY_VOLUMEDOWN>;
124120 channel = <0>;
....@@ -128,8 +124,6 @@
128124 };
129125
130126 &mmc0 {
131
- pinctrl-names = "default";
132
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot>;
133127 vmmc-supply = <&reg_dcdc1>;
134128 cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
135129 bus-width = <4>;
....@@ -138,7 +132,7 @@
138132
139133 &mmc1 {
140134 pinctrl-names = "default";
141
- pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_parrot>;
135
+ pinctrl-0 = <&mmc1_pg_pins>;
142136 vmmc-supply = <&reg_aldo1>;
143137 mmc-pwrseq = <&wifi_pwrseq>;
144138 bus-width = <4>;
....@@ -158,42 +152,10 @@
158152
159153 &mmc2_8bit_pins {
160154 drive-strength = <40>;
161
- bias-pull-up;
162155 };
163156
164157 &ohci0 {
165158 status = "okay";
166
-};
167
-
168
-&pio {
169
- mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
170
- pins = "PD14";
171
- function = "gpio_in";
172
- bias-pull-up;
173
- };
174
-
175
- led_pins_parrot: led_pins@0 {
176
- pins = "PE16", "PE17";
177
- function = "gpio_out";
178
- };
179
-
180
- usb0_id_det: usb0_id_detect_pin@0 {
181
- pins = "PD10";
182
- function = "gpio_in";
183
- bias-pull-up;
184
- };
185
-
186
- usb1_vbus_pin_parrot: usb1_vbus_pin@0 {
187
- pins = "PD12";
188
- function = "gpio_out";
189
- };
190
-};
191
-
192
-&r_pio {
193
- wifi_reset_pin_parrot: wifi_reset_pin@0 {
194
- pins = "PL6";
195
- function = "gpio_out";
196
- };
197159 };
198160
199161 &r_rsb {
....@@ -319,8 +281,6 @@
319281 };
320282
321283 &reg_usb1_vbus {
322
- pinctrl-names = "default";
323
- pinctrl-0 = <&usb1_vbus_pin_parrot>;
324284 gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */
325285 status = "okay";
326286 };
....@@ -331,7 +291,7 @@
331291
332292 &uart0 {
333293 pinctrl-names = "default";
334
- pinctrl-0 = <&uart0_pins_b>;
294
+ pinctrl-0 = <&uart0_pb_pins>;
335295 status = "okay";
336296 };
337297
....@@ -346,10 +306,8 @@
346306
347307 &usbphy {
348308 status = "okay";
349
- pinctrl-names = "default";
350
- pinctrl-0 = <&usb0_id_det>;
351309 usb0_vbus-supply = <&reg_drivevbus>;
352
- usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */
310
+ usb0_id_det-gpios = <&pio 3 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD10 */
353311 usb0_vbus_power-supply = <&usb_power_supply>;
354312 usb1_vbus-supply = <&reg_usb1_vbus>;
355313 };