hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
....@@ -73,8 +73,6 @@
7373
7474 leds {
7575 compatible = "gpio-leds";
76
- pinctrl-names = "default";
77
- pinctrl-0 = <&leds_opc>, <&leds_r_opc>;
7876
7977 pwr_led {
8078 label = "orangepi:green:pwr";
....@@ -90,8 +88,6 @@
9088
9189 r_gpio_keys {
9290 compatible = "gpio-keys";
93
- pinctrl-names = "default";
94
- pinctrl-0 = <&sw_r_opc>;
9591
9692 sw4 {
9793 label = "sw4";
....@@ -113,8 +109,7 @@
113109 gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
114110 enable-active-high;
115111 gpios-states = <0x1>;
116
- states = <1100000 0x0
117
- 1300000 0x1>;
112
+ states = <1100000 0>, <1300000 1>;
118113 };
119114 };
120115
....@@ -166,25 +161,6 @@
166161 status = "okay";
167162 };
168163
169
-&pio {
170
- leds_opc: led_pins {
171
- pins = "PA15";
172
- function = "gpio_out";
173
- };
174
-};
175
-
176
-&r_pio {
177
- leds_r_opc: led_pins {
178
- pins = "PL10";
179
- function = "gpio_out";
180
- };
181
-
182
- sw_r_opc: key_pins {
183
- pins = "PL3";
184
- function = "gpio_in";
185
- };
186
-};
187
-
188164 &reg_usb0_vbus {
189165 gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
190166 status = "okay";
....@@ -192,7 +168,7 @@
192168
193169 &uart0 {
194170 pinctrl-names = "default";
195
- pinctrl-0 = <&uart0_pins_a>;
171
+ pinctrl-0 = <&uart0_pa_pins>;
196172 status = "okay";
197173 };
198174