移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
..
..
@@ -69,8 +69,6 @@
69
69
 };
70
70
 
71
71
 &i2c0 {
72
-	pinctrl-names = "default";
73
-	pinctrl-0 = <&i2c0_pins_a>;
74
72
 	status = "okay";
75
73
 
76
74
 	axp209: pmic@34 {
..
..
@@ -80,8 +78,6 @@
80
78
 };
81
79
 
82
80
 &i2c1 {
83
-	pinctrl-names = "default";
84
-	pinctrl-0 = <&i2c1_pins_a>;
85
81
 	status = "okay";
86
82
 
87
83
 	pcf8563: rtc@51 {
..
..
@@ -91,8 +87,6 @@
91
87
 };
92
88
 
93
89
 &i2c2 {
94
-	pinctrl-names = "default";
95
-	pinctrl-0 = <&i2c2_pins_a>;
96
90
 	status = "okay";
97
91
 };
98
92
 
..
..
@@ -100,14 +94,14 @@
100
94
 	vref-supply = <&reg_ldo2>;
101
95
 	status = "okay";
102
96
 
103
-	button@200 {
97
+	button-200 {
104
98
 		label = "Volume Up";
105
99
 		linux,code = <KEY_VOLUMEUP>;
106
100
 		channel = <0>;
107
101
 		voltage = <200000>;
108
102
 	};
109
103
 
110
-	button@400 {
104
+	button-400 {
111
105
 		label = "Volume Down";
112
106
 		linux,code = <KEY_VOLUMEDOWN>;
113
107
 		channel = <0>;
..
..
@@ -116,8 +110,6 @@
116
110
 };
117
111
 
118
112
 &mmc0 {
119
-	pinctrl-names = "default";
120
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
121
113
 	vmmc-supply = <&reg_vcc3v3>;
122
114
 	bus-width = <4>;
123
115
 	cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
..
..
@@ -130,25 +122,6 @@
130
122
 
131
123
 &otg_sram {
132
124
 	status = "okay";
133
-};
134
-
135
-&pio {
136
-	mmc0_cd_pin_h702: mmc0_cd_pin@0 {
137
-		pins = "PG0";
138
-		function = "gpio_in";
139
-		bias-pull-up;
140
-	};
141
-
142
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
143
-		pins = "PG2";
144
-		function = "gpio_in";
145
-		bias-pull-up;
146
-	};
147
-
148
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
149
-		pins = "PG1";
150
-		function = "gpio_in";
151
-	};
152
125
 };
153
126
 
154
127
 #include "axp209.dtsi"
..
..
@@ -191,7 +164,7 @@
191
164
 
192
165
 &uart1 {
193
166
 	pinctrl-names = "default";
194
-	pinctrl-0 = <&uart1_pins_b>;
167
+	pinctrl-0 = <&uart1_pg_pins>;
195
168
 	status = "okay";
196
169
 };
197
170
 
..
..
@@ -201,9 +174,7 @@
201
174
 };
202
175
 
203
176
 &usbphy {
204
-	pinctrl-names = "default";
205
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
206
-	usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
177
+	usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
207
178
 	usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
208
179
 	usb0_vbus-supply = <&reg_usb0_vbus>;
209
180
 	usb1_vbus-supply = <&reg_ldo3>;