forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun6i-a31s-primo81.dts
....@@ -90,19 +90,13 @@
9090
9191 &i2c0 {
9292 /* pull-ups and device VDDIO use AXP221 DLDO3 */
93
- pinctrl-names = "default";
94
- pinctrl-0 = <&i2c0_pins_a>;
9593 status = "failed";
9694 };
9795
9896 &i2c1 {
99
- pinctrl-names = "default";
100
- pinctrl-0 = <&i2c1_pins_a>;
10197 status = "okay";
10298
10399 ctp@5d {
104
- pinctrl-names = "default";
105
- pinctrl-0 = <&gt911_int_primo81>;
106100 compatible = "goodix,gt911";
107101 reg = <0x5d>;
108102 interrupt-parent = <&pio>;
....@@ -112,8 +106,6 @@
112106 };
113107
114108 &i2c2 {
115
- pinctrl-names = "default";
116
- pinctrl-0 = <&i2c2_pins_a>;
117109 status = "okay";
118110
119111 accelerometer@1c {
....@@ -131,14 +123,14 @@
131123 vref-supply = <&reg_aldo3>;
132124 status = "okay";
133125
134
- button@158 {
126
+ button-158 {
135127 label = "Volume Up";
136128 linux,code = <KEY_VOLUMEUP>;
137129 channel = <0>;
138130 voltage = <158730>;
139131 };
140132
141
- button@349 {
133
+ button-349 {
142134 label = "Volume Down";
143135 linux,code = <KEY_VOLUMEDOWN>;
144136 channel = <0>;
....@@ -147,8 +139,6 @@
147139 };
148140
149141 &mmc0 {
150
- pinctrl-names = "default";
151
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
152142 vmmc-supply = <&reg_dcdc1>;
153143 bus-width = <4>;
154144 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
....@@ -156,19 +146,8 @@
156146 };
157147
158148 &pio {
159
- gt911_int_primo81: gt911_int_pin@0 {
160
- pins = "PA3";
161
- function = "gpio_in";
162
- };
163
-
164
- mma8452_int_primo81: mma8452_int_pin@0 {
149
+ mma8452_int_primo81: mma8452-int-pin {
165150 pins = "PA9";
166
- function = "gpio_in";
167
- bias-pull-up;
168
- };
169
-
170
- mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
171
- pins = "PA8";
172151 function = "gpio_in";
173152 bias-pull-up;
174153 };
....@@ -281,7 +260,7 @@
281260 };
282261
283262 &usbphy {
284
- usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
263
+ usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
285264 usb0_vbus_power-supply = <&usb_power_supply>;
286265 usb0_vbus-supply = <&reg_drivevbus>;
287266 usb1_vbus-supply = <&reg_dldo1>;