Skip to content

Commit 87f1e0f

Browse files
ghhccghkghhccghk
committed
Update Aiot-rk3588a device tree: refine regulator and GPIO configurations, add and update LED and USB settings
1 parent 1432817 commit 87f1e0f

File tree

1 file changed

+136
-33
lines changed

1 file changed

+136
-33
lines changed

‎patch/kernel/rk35xx-vendor-6.1/dt/rk3588-aiot-rk3588a.dts‎

Lines changed: 136 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
model = "Shimeta Aiot rk3588a";
1414
compatible = "rockchip,rk3588-aiot-rk3588a", "rockchip,rk3588";
1515

16+
/delete-node/ chosen;
17+
/delete-node/ work_led;
18+
1619
chosen {
1720
bootargs = "earlycon=uart8250,mmio32,0xfeb50000 console=ttyFIQ0 irqchip.gicv3_pseudo_nmi=0";
1821
};
@@ -23,6 +26,10 @@
2326
linux,default-trigger = "heartbeat";
2427
gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
2528
};
29+
red_led: red_led {
30+
linux,default-trigger = "none";
31+
gpios = <&nca9555 4 GPIO_ACTIVE_LOW>;
32+
};
2633
};
2734

2835
adc_keys: adc-keys {
@@ -68,7 +75,8 @@
6875
panel-edp0 {
6976
compatible = "simple-panel";
7077
backlight = <&backlight>;
71-
power-supply = <&vcc3v3_lcd>;
78+
power-supply = <&vcc_3v3_s0>;
79+
enable-gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
7280
prepare-delay-ms = <120>;
7381
enable-delay-ms = <120>;
7482
unprepare-delay-ms = <120>;
@@ -127,19 +135,39 @@
127135
regulator-max-microvolt = <0x4c4b40>;
128136
enable-active-high;
129137
gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
130-
vin-supply = <&vcc5v0_usb>;
138+
vin-supply = <&vcc5v0_usbdcin>;
131139
pinctrl-names = "default";
132140
pinctrl-0 = <&vcc5v0_peripherals_en>;
133141
};
134142

135-
vcc5v0_usb:vcc5v0-usb {
143+
vcc5v0_usb0:vcc5v0-usb0 {
136144
compatible = "regulator-fixed";
137-
regulator-name = "vcc5v0_usb";
145+
regulator-name = "vcc5v0_usb0";
138146
regulator-always-on;
139147
regulator-boot-on;
148+
gpio = <&nca9555 0 GPIO_ACTIVE_HIGH>;
140149
regulator-min-microvolt = <0x4c4b40>;
141150
regulator-max-microvolt = <0x4c4b40>;
142-
vin-supply = <&vcc5v0_usbdcin>;
151+
vin-supply = <&vcc5v0_peripherals>;
152+
};
153+
154+
155+
vcc5v0_usb2: vcc5v0-usb2 {
156+
compatible = "regulator-fixed";
157+
regulator-name = "vcc5v0_usb2";
158+
regulator-always-on;
159+
regulator-boot-on;
160+
gpio = <&nca9555 1 GPIO_ACTIVE_HIGH>;
161+
vin-supply = <&vcc5v0_peripherals>;
162+
};
163+
164+
vcc5v0_usb1: vcc5v0-usb1 {
165+
compatible = "regulator-fixed";
166+
regulator-name = "vcc5v0_usb1";
167+
regulator-always-on;
168+
regulator-boot-on;
169+
gpio = <&nca9555 7 GPIO_ACTIVE_HIGH>;
170+
vin-supply = <&vcc5v0_peripherals>;
143171
};
144172

145173
vcc5v0_usbdcin:vcc5v0-usbdcin {
@@ -152,6 +180,60 @@
152180
vin-supply = <&vcc12v_dcin>;
153181
};
154182

183+
vcc5v0_test1: vcc5v0-test1 {
184+
compatible = "regulator-fixed";
185+
regulator-name = "vcc5v0_test1";
186+
regulator-always-on;
187+
regulator-boot-on;
188+
gpio = <&gpio1 0x16 GPIO_ACTIVE_HIGH>;
189+
vin-supply = <&vcc5v0_peripherals>;
190+
};
191+
192+
vcc5v0_test2: vcc5v0-test2 {
193+
compatible = "regulator-fixed";
194+
regulator-name = "vcc5v0_test2";
195+
regulator-always-on;
196+
regulator-boot-on;
197+
gpio = <&gpio1 0x08 GPIO_ACTIVE_HIGH>;
198+
vin-supply = <&vcc5v0_peripherals>;
199+
};
200+
201+
vcc5v0_test3: vcc5v0-test3 {
202+
compatible = "regulator-fixed";
203+
regulator-name = "vcc5v0_test3";
204+
regulator-always-on;
205+
regulator-boot-on;
206+
gpio = <&gpio1 0x0d GPIO_ACTIVE_HIGH>;
207+
vin-supply = <&vcc5v0_peripherals>;
208+
};
209+
210+
vcc5v0_test5: vcc5v0-test5 {
211+
compatible = "regulator-fixed";
212+
regulator-name = "vcc5v0_test5";
213+
regulator-always-on;
214+
regulator-boot-on;
215+
gpio = <&gpio1 0x0c GPIO_ACTIVE_HIGH>;
216+
vin-supply = <&vcc5v0_peripherals>;
217+
};
218+
219+
vcc5v0_test4: vcc5v0-test4 {
220+
compatible = "regulator-fixed";
221+
regulator-name = "vcc5v0_test4";
222+
regulator-always-on;
223+
regulator-boot-on;
224+
gpio = <&gpio4 0x0a GPIO_ACTIVE_HIGH>;
225+
vin-supply = <&vcc5v0_peripherals>;
226+
};
227+
228+
vcc5v0_usb2: vcc5v0-usb2 {
229+
compatible = "regulator-fixed";
230+
regulator-name = "vcc5v0_usb2";
231+
regulator-always-on;
232+
regulator-boot-on;
233+
gpio = <&nca9555 1 GPIO_ACTIVE_HIGH>;
234+
vin-supply = <&vcc5v0_peripherals>;
235+
};
236+
155237
vcc12v_dcin:vcc12v-dcin {
156238
compatible = "regulator-fixed";
157239
regulator-name = "vcc12v_dcin";
@@ -160,20 +242,20 @@
160242
regulator-min-microvolt = <0xb71b00>;
161243
regulator-max-microvolt = <0xb71b00>;
162244
};
245+
246+
test-power {
247+
status = "okay";
248+
};
163249
};
164250

165251
&pinctrl {
166-
mcu {
167-
mcum0_pins: mcum0-pins {
168-
rockchip,pins =
169-
<4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
170-
<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
171-
};
172-
173-
mcum1_pins: mcum1-pins {
174-
rockchip,pins =
175-
<3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
176-
<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
252+
smdtio {
253+
smdtio_gpio:smdtio-gpio {
254+
rockchip,pins = <1 0x16 RK_FUNC_GPIO &pcfg_pull_up>,
255+
<1 0x08 RK_FUNC_GPIO &pcfg_pull_up>,
256+
<1 0x0d RK_FUNC_GPIO &pcfg_pull_up>,
257+
<1 0x0c RK_FUNC_GPIO &pcfg_pull_up>,
258+
<4 0x0a RK_FUNC_GPIO &pcfg_pull_up>;
177259
};
178260
};
179261

@@ -191,25 +273,24 @@
191273
usb {
192274
vcc5v0_peripherals_en: vcc5v0-peripherals-en {
193275
rockchip,pins =
194-
<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
276+
<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
195277
};
196278
};
197279
};
280+
/** 关闭这个节点防止冲突 */
281+
&gt1x {
282+
status = "disabled";
283+
};
198284

199-
&i2c5 {
285+
/** 修改成为正确的GPIO */
286+
&es8388_sound {
287+
hp-con-gpio = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>;
200288
status = "okay";
201-
gt1x: gt1x@14 {
202-
compatible = "goodix,gt1x";
203-
reg = <0x14>;
204-
pinctrl-names = "default";
205-
pinctrl-0 = <&touch_gpio>;
206-
status = "disabled";
207-
goodix,rst-gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
208-
goodix,irq-gpio = <&gpio3 RK_PC0 IRQ_TYPE_LEVEL_LOW>;
209-
power-supply = <&vcc3v3_lcd_n>;
210-
};
211289
};
212290

291+
&gmac1 {
292+
snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
293+
};
213294

214295
&i2c6 {
215296
status = "okay";
@@ -227,8 +308,6 @@
227308
status = "okay";
228309
reg = <0x62>;
229310
#pwm-cells = <2>;
230-
/* MCU interrupt pin: GPIO0_B0 */
231-
int-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
232311
};
233312

234313
usbc0: fusb302@22 {
@@ -300,8 +379,6 @@
300379

301380
};
302381

303-
304-
305382
&usbdrd_dwc3_0 {
306383
dr_mode = "otg";
307384
usb-role-switch;
@@ -348,11 +425,12 @@
348425
status = "okay";
349426
};
350427

351-
352428
&dp0 {
353429
status = "disabled";
354430
};
355431

432+
433+
/** HDMI 0 不使用 */
356434
&hdmi0 {
357435
status = "disabled";
358436
};
@@ -366,10 +444,22 @@
366444
status = "disabled";
367445
};
368446

447+
&hdmi0_sound {
448+
status = "disabled";
449+
};
450+
451+
&hdmi0_in_vp0 {
452+
status = "disabled";
453+
};
454+
455+
456+
369457
&hdmi1 {
458+
enable-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_HIGH>;
370459
status = "okay";
371460
};
372461

462+
373463
&route_hdmi1 {
374464
status = "okay";
375465
};
@@ -381,6 +471,7 @@
381471
&edp0 {
382472
force-hpd;
383473
phys = <&combphy2_psu PHY_TYPE_DP>;
474+
max-link-rate = <0x14>;
384475
phy-names = "dp";
385476
status = "okay";
386477
ports {
@@ -415,6 +506,10 @@
415506
status = "disabled";
416507
};
417508

509+
/** not pcie
510+
**
511+
**/
512+
418513
&pcie2x1l0 {
419514
status = "disabled";
420515
};
@@ -439,3 +534,11 @@
439534
&u2phy3_host {
440535
status = "okay";
441536
};
537+
538+
&usbhost3_0{
539+
status = "okay";
540+
};
541+
542+
&usbhost_dwc3_0 {
543+
status = "okay";
544+
};

0 commit comments

Comments
 (0)