hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
....@@ -78,8 +78,6 @@
7878 };
7979
8080 &i2c0 {
81
- pinctrl-names = "default";
82
- pinctrl-0 = <&i2c0_pins_a>;
8381 status = "okay";
8482
8583 axp209: pmic@34 {
....@@ -91,8 +89,6 @@
9189 #include "axp209.dtsi"
9290
9391 &i2c1 {
94
- pinctrl-names = "default";
95
- pinctrl-0 = <&i2c1_pins_a>;
9692 status = "okay";
9793
9894 pcf8563: rtc@51 {
....@@ -105,14 +101,14 @@
105101 vref-supply = <&reg_ldo2>;
106102 status = "okay";
107103
108
- button@200 {
104
+ button-200 {
109105 label = "Volume Up";
110106 linux,code = <KEY_VOLUMEUP>;
111107 channel = <0>;
112108 voltage = <200000>;
113109 };
114110
115
- button@400 {
111
+ button-400 {
116112 label = "Volume Down";
117113 linux,code = <KEY_VOLUMEDOWN>;
118114 channel = <0>;
....@@ -121,8 +117,6 @@
121117 };
122118
123119 &mmc0 {
124
- pinctrl-names = "default";
125
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
126120 vmmc-supply = <&reg_vcc3v3>;
127121 bus-width = <4>;
128122 cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
....@@ -133,29 +127,9 @@
133127 status = "okay";
134128 };
135129
136
-&pio {
137
- mmc0_cd_pin_d709: mmc0_cd_pin@0 {
138
- pins = "PG0";
139
- function = "gpio_in";
140
- bias-pull-up;
141
- };
142
-
143
- usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
144
- pins = "PG1";
145
- function = "gpio_in";
146
- bias-pull-down;
147
- };
148
-
149
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
150
- pins = "PG2";
151
- function = "gpio_in";
152
- bias-pull-up;
153
- };
154
-};
155
-
156130 &pwm {
157131 pinctrl-names = "default";
158
- pinctrl-0 = <&pwm0_pins>;
132
+ pinctrl-0 = <&pwm0_pin>;
159133 status = "okay";
160134 };
161135
....@@ -197,7 +171,7 @@
197171
198172 &uart1 {
199173 pinctrl-names = "default";
200
- pinctrl-0 = <&uart1_pins_b>;
174
+ pinctrl-0 = <&uart1_pg_pins>;
201175 status = "okay";
202176 };
203177
....@@ -207,10 +181,8 @@
207181 };
208182
209183 &usbphy {
210
- pinctrl-names = "default";
211
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
212
- usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
213
- usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
184
+ usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
185
+ usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
214186 usb0_vbus-supply = <&reg_usb0_vbus>;
215187 usb1_vbus-supply = <&reg_ldo3>;
216188 status = "okay";