修改led为gpio

hc

2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d

 kernel/arch/arm/boot/dts/rk3229-evb.dts
..
..
@@ -2,9 +2,8 @@
2
2
 
3
3
 /dts-v1/;
4
4
 
5
-#include "rk322x.dtsi"
6
-#include "rk3229-cpu-opp.dtsi"
7
-#include "rk322x-android.dtsi"
5
+#include <dt-bindings/input/input.h>
6
+#include "rk3229.dtsi"
8
7
 
9
8
 / {
10
9
 	model = "Rockchip RK3229 Evaluation board";
..
..
@@ -24,117 +23,23 @@
24
23
 		regulator-max-microvolt = <12000000>;
25
24
 	};
26
25
 
27
-	gpio_keys {
28
-		compatible = "gpio-keys";
29
-		#address-cells = <1>;
30
-		#size-cells = <0>;
31
-		autorepeat;
32
-
33
-		pinctrl-names = "default";
34
-		pinctrl-0 = <&pwr_key>;
35
-
36
-		power_key: power-key {
37
-			label = "GPIO Key Power";
38
-			gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
39
-			linux,code = <KEY_POWER>;
40
-			debounce-interval = <100>;
41
-			wakeup-source;
42
-		};
43
-	};
44
-
45
-	hdmi_sound: hdmi-sound {
46
-		status = "okay";
47
-		compatible = "simple-audio-card";
48
-		simple-audio-card,format = "i2s";
49
-		simple-audio-card,mclk-fs = <256>;
50
-		simple-audio-card,name = "rockchip,hdmi";
51
-		simple-audio-card,cpu {
52
-			sound-dai = <&i2s0>;
53
-		};
54
-		simple-audio-card,codec {
55
-			sound-dai = <&hdmi>;
56
-		};
57
-	};
58
-
59
-	reserved-memory {
60
-		#address-cells = <1>;
61
-		#size-cells = <1>;
62
-		ranges;
63
-
64
-		trust_reserved: trust@0x68400000 {
65
-			reg = <0x68400000 0xe00000>;
66
-			no-map;
67
-		};
68
-	};
69
-
70
-	sdio_pwrseq: sdio-pwrseq {
71
-		compatible = "mmc-pwrseq-simple";
72
-		clocks = <&hym8563>;
73
-		clock-names = "ext_clock";
74
-		pinctrl-names = "default";
75
-		pinctrl-0 = <&wifi_enable_h>;
76
-
77
-		/*
78
-		 * On the module itself this is one of these (depending
79
-		 * on the actual card populated):
80
-		 * - SDIO_RESET_L_WL_REG_ON
81
-		 * - PDN (power down when low)
82
-		 */
83
-		reset-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>; /* GPIO2_D2 */
84
-	};
85
-
86
-	sound {
87
-		compatible = "simple-audio-card";
88
-		simple-audio-card,format = "i2s";
89
-		simple-audio-card,mclk-fs = <256>;
90
-		simple-audio-card,name = "rockchip,rk3229";
91
-		simple-audio-card,cpu {
92
-			sound-dai = <&i2s1>;
93
-		};
94
-		simple-audio-card,codec {
95
-			sound-dai = <&codec>;
96
-		};
97
-	};
98
-
99
-	spdif_out: spdif-out {
100
-		status = "okay";
101
-		compatible = "linux,spdif-dit";
102
-		#sound-dai-cells = <0>;
103
-	};
104
-
105
-	spdif-sound {
106
-		status = "okay";
107
-		compatible = "simple-audio-card";
108
-		simple-audio-card,name = "ROCKCHIP,SPDIF";
109
-		simple-audio-card,cpu {
110
-			sound-dai = <&spdif>;
111
-		};
112
-		simple-audio-card,codec {
113
-			sound-dai = <&spdif_out>;
114
-		};
26
+	ext_gmac: ext_gmac {
27
+		compatible = "fixed-clock";
28
+		clock-frequency = <125000000>;
29
+		clock-output-names = "ext_gmac";
30
+		#clock-cells = <0>;
115
31
 	};
116
32
 
117
33
 	vcc_host: vcc-host-regulator {
118
34
 		compatible = "regulator-fixed";
119
35
 		enable-active-high;
120
-		gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>;
36
+		gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
121
37
 		pinctrl-names = "default";
122
38
 		pinctrl-0 = <&host_vbus_drv>;
123
39
 		regulator-name = "vcc_host";
124
40
 		regulator-always-on;
125
41
 		regulator-boot-on;
126
42
 		vin-supply = <&vcc_sys>;
127
-	};
128
-
129
-	vcc_otg_vbus: otg-vbus-regulator {
130
-		compatible = "regulator-fixed";
131
-		gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
132
-		pinctrl-names = "default";
133
-		pinctrl-0 = <&otg_vbus_drv>;
134
-		regulator-name = "vcc_otg_vbus";
135
-		regulator-min-microvolt = <5000000>;
136
-		regulator-max-microvolt = <5000000>;
137
-		enable-active-high;
138
43
 	};
139
44
 
140
45
 	vcc_phy: vcc-phy-regulator {
..
..
@@ -178,8 +83,6 @@
178
83
 
179
84
 	vdd_arm: vdd-arm-regulator {
180
85
 		compatible = "pwm-regulator";
181
-		rockchip,pwm_id = <1>;
182
-		rockchip,pwm_voltage = <1100000>;
183
86
 		pwms = <&pwm1 0 25000 1>;
184
87
 		pwm-supply = <&vcc_sys>;
185
88
 		regulator-name = "vdd_arm";
..
..
@@ -191,8 +94,6 @@
191
94
 
192
95
 	vdd_log: vdd-log-regulator {
193
96
 		compatible = "pwm-regulator";
194
-		rockchip,pwm_id = <2>;
195
-		rockchip,pwm_voltage = <1200000>;
196
97
 		pwms = <&pwm2 0 25000 1>;
197
98
 		pwm-supply = <&vcc_sys>;
198
99
 		regulator-name = "vdd_log";
..
..
@@ -202,13 +103,19 @@
202
103
 		regulator-boot-on;
203
104
 	};
204
105
 
205
-	wireless-wlan {
206
-		compatible = "wlan-platdata";
207
-		rockchip,grf = <&grf>;
208
-		wifi_chip_type = "ap6335";
209
-		sdio_vref = <1800>;
210
-		WIFI,host_wake_irq = <&gpio0 28 GPIO_ACTIVE_HIGH>;
211
-		status = "okay";
106
+	gpio_keys {
107
+		compatible = "gpio-keys";
108
+		autorepeat;
109
+		pinctrl-names = "default";
110
+		pinctrl-0 = <&pwr_key>;
111
+
112
+		power_key: power-key {
113
+			label = "GPIO Key Power";
114
+			gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
115
+			linux,code = <KEY_POWER>;
116
+			debounce-interval = <100>;
117
+			wakeup-source;
118
+		};
212
119
 	};
213
120
 };
214
121
 
..
..
@@ -228,26 +135,26 @@
228
135
 	cpu-supply = <&vdd_arm>;
229
136
 };
230
137
 
138
+&emmc {
139
+	cap-mmc-highspeed;
140
+	non-removable;
141
+	status = "okay";
142
+};
143
+
231
144
 &gmac {
232
-	assigned-clocks = <&cru SCLK_MAC_SRC>;
233
-	assigned-clock-rates = <50000000>;
234
-	clock_in_out = "output";
145
+	assigned-clocks = <&cru SCLK_MAC_EXTCLK>, <&cru SCLK_MAC>;
146
+	assigned-clock-parents = <&ext_gmac>, <&cru SCLK_MAC_EXTCLK>;
147
+	clock_in_out = "input";
235
148
 	phy-supply = <&vcc_phy>;
236
-	phy-mode = "rmii";
237
-	phy-is-integrated;
149
+	phy-mode = "rgmii";
150
+	pinctrl-names = "default";
151
+	pinctrl-0 = <&rgmii_pins>;
152
+	snps,reset-gpio = <&gpio2 RK_PD0 GPIO_ACTIVE_LOW>;
153
+	snps,reset-active-low;
154
+	snps,reset-delays-us = <0 10000 1000000>;
155
+	tx_delay = <0x30>;
156
+	rx_delay = <0x10>;
238
157
 	status = "okay";
239
-};
240
-
241
-&gpu {
242
-	status = "okay";
243
-	mali-supply = <&vdd_log>;
244
-};
245
-
246
-&hdmi {
247
-	status = "okay";
248
-	#sound-dai-cells = <0>;
249
-	ddc-i2c-scl-high-time-ns = <9625>;
250
-	ddc-i2c-scl-low-time-ns = <10000>;
251
158
 };
252
159
 
253
160
 &io_domains {
..
..
@@ -258,34 +165,6 @@
258
165
 	vccio4-supply = <&vccio_3v3>;
259
166
 };
260
167
 
261
-&i2s1 {
262
-	#sound-dai-cells = <0>;
263
-	status = "okay";
264
-};
265
-
266
-&codec {
267
-	#sound-dai-cells = <0>;
268
-	status = "okay";
269
-};
270
-
271
-&i2c0 {
272
-	status = "okay";
273
-
274
-	hym8563: hym8563@51 {
275
-		compatible = "haoyu,hym8563";
276
-		reg = <0x51>;
277
-		#clock-cells = <0>;
278
-		clock-frequency = <32768>;
279
-		clock-output-names = "xin32k";
280
-	};
281
-};
282
-
283
-&i2s0 {
284
-	status = "okay";
285
-	rockchip,bclk-fs = <128>;
286
-	#sound-dai-cells = <0>;
287
-};
288
-
289
168
 &pinctrl {
290
169
 	keys {
291
170
 		pwr_key: pwr-key {
..
..
@@ -293,25 +172,9 @@
293
172
 		};
294
173
 	};
295
174
 
296
-	sdmmc {
297
-		sdmmc_pwr: sdmmc-pwr {
298
-			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
299
-		};
300
-	};
301
-
302
-	sdio-pwrseq {
303
-		wifi_enable_h: wifi-enable-h {
304
-			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
305
-		};
306
-	};
307
-
308
175
 	usb {
309
176
 		host_vbus_drv: host-vbus-drv {
310
177
 			rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
311
-		};
312
-
313
-		otg_vbus_drv: otg-vbus-drv {
314
-			rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
315
178
 		};
316
179
 	};
317
180
 };
..
..
@@ -325,7 +188,7 @@
325
188
 &pwm2 {
326
189
 	status = "okay";
327
190
 	pinctrl-names = "active";
328
-	pinctrl-0 = <&pwm2_pin_pull_up>;
191
+	pinctrl-0 = <&pwm2_pin_pull_down>;
329
192
 };
330
193
 
331
194
 &tsadc {
..
..
@@ -333,20 +196,8 @@
333
196
 	status = "okay";
334
197
 };
335
198
 
336
-&sdio {
199
+&uart2 {
337
200
 	status = "okay";
338
-	mmc-pwrseq = <&sdio_pwrseq>;
339
-};
340
-
341
-&sdmmc {
342
-	status = "okay";
343
-	pinctrl-names = "default";
344
-	pinctrl-0 = <&sdmmc_pwr &sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
345
-};
346
-
347
-&spdif {
348
-	status = "okay";
349
-	#sound-dai-cells = <0>;
350
201
 };
351
202
 
352
203
 &u2phy0 {
..
..
@@ -374,10 +225,6 @@
374
225
 		phy-supply = <&vcc_host>;
375
226
 		status = "okay";
376
227
 	};
377
-};
378
-
379
-&u2phy0_otg {
380
-	vbus-supply = <&vcc_otg_vbus>;
381
228
 };
382
229
 
383
230
 &usb_host0_ehci {