Skip to content

Commit d0f708d

Browse files
chainsxigorpecovnik
authored andcommitted
sakurapi-rk3308b: fix usb20phy_otg&u2phy_host, update the regulator name
1 parent df6a133 commit d0f708d

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

patch/kernel/archive/rockchip64-6.12/dt/rk3308-sakurapi-rk3308b.dts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
3131
};
3232

33-
vcc5v0_sys: vcc5v0-sys {
33+
vcc5v0_sys: regulator-vcc5v0-sys {
3434
compatible = "regulator-fixed";
3535
regulator-name = "vcc5v0_sys";
3636
regulator-always-on;
@@ -39,7 +39,7 @@
3939
regulator-max-microvolt = <5000000>;
4040
};
4141

42-
vdd_core: vdd-core {
42+
vdd_core: regulator-vdd-core {
4343
compatible = "pwm-regulator";
4444
pwms = <&pwm0 0 5000 1>;
4545
regulator-name = "vdd_core";
@@ -52,7 +52,7 @@
5252
pwm-supply = <&vcc5v0_sys>;
5353
};
5454

55-
vdd_log: vdd-log {
55+
vdd_log: regulator-vdd-log {
5656
compatible = "regulator-fixed";
5757
regulator-name = "vdd_log";
5858
regulator-always-on;
@@ -62,7 +62,7 @@
6262
vin-supply = <&vcc5v0_sys>;
6363
};
6464

65-
vcc_ddr: vcc-ddr {
65+
vcc_ddr: regulator-vcc-ddr {
6666
compatible = "regulator-fixed";
6767
regulator-name = "vcc_ddr";
6868
regulator-always-on;
@@ -72,7 +72,7 @@
7272
vin-supply = <&vcc5v0_sys>;
7373
};
7474

75-
vcc_1v8: vcc-1v8 {
75+
vcc_1v8: regulator-vcc-1v8 {
7676
compatible = "regulator-fixed";
7777
regulator-name = "vcc_1v8";
7878
regulator-always-on;
@@ -82,7 +82,7 @@
8282
vin-supply = <&vcc_io>;
8383
};
8484

85-
vcc_io: vcc-io {
85+
vcc_io: regulator-vcc-io {
8686
compatible = "regulator-fixed";
8787
regulator-name = "vcc_io";
8888
regulator-always-on;
@@ -92,14 +92,14 @@
9292
vin-supply = <&vcc5v0_sys>;
9393
};
9494

95-
vcc_phy: vcc-phy-regulator {
95+
vcc_phy: regulator-vcc-phy-regulator {
9696
compatible = "regulator-fixed";
9797
regulator-name = "vcc_phy";
9898
regulator-always-on;
9999
regulator-boot-on;
100100
};
101101

102-
vcc5v0_otg: vcc5v0-otg {
102+
vcc5v0_otg: regulator-vcc5v0-otg {
103103
compatible = "regulator-fixed";
104104
regulator-name = "vcc5v0_otg";
105105
regulator-always-on;
@@ -312,6 +312,7 @@
312312
};
313313

314314
&usb20_otg {
315+
dr_mode = "peripheral";
315316
status = "okay";
316317
};
317318

@@ -324,7 +325,7 @@
324325
};
325326

326327
&u2phy_host {
327-
state = "okay";
328+
status = "okay";
328329
};
329330

330331
&usb_host_ehci {

patch/kernel/archive/rockchip64-6.14/dt/rk3308-sakurapi-rk3308b.dts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
3131
};
3232

33-
vcc5v0_sys: vcc5v0-sys {
33+
vcc5v0_sys: regulator-vcc5v0-sys {
3434
compatible = "regulator-fixed";
3535
regulator-name = "vcc5v0_sys";
3636
regulator-always-on;
@@ -39,7 +39,7 @@
3939
regulator-max-microvolt = <5000000>;
4040
};
4141

42-
vdd_core: vdd-core {
42+
vdd_core: regulator-vdd-core {
4343
compatible = "pwm-regulator";
4444
pwms = <&pwm0 0 5000 1>;
4545
regulator-name = "vdd_core";
@@ -52,7 +52,7 @@
5252
pwm-supply = <&vcc5v0_sys>;
5353
};
5454

55-
vdd_log: vdd-log {
55+
vdd_log: regulator-vdd-log {
5656
compatible = "regulator-fixed";
5757
regulator-name = "vdd_log";
5858
regulator-always-on;
@@ -62,7 +62,7 @@
6262
vin-supply = <&vcc5v0_sys>;
6363
};
6464

65-
vcc_ddr: vcc-ddr {
65+
vcc_ddr: regulator-vcc-ddr {
6666
compatible = "regulator-fixed";
6767
regulator-name = "vcc_ddr";
6868
regulator-always-on;
@@ -72,7 +72,7 @@
7272
vin-supply = <&vcc5v0_sys>;
7373
};
7474

75-
vcc_1v8: vcc-1v8 {
75+
vcc_1v8: regulator-vcc-1v8 {
7676
compatible = "regulator-fixed";
7777
regulator-name = "vcc_1v8";
7878
regulator-always-on;
@@ -82,7 +82,7 @@
8282
vin-supply = <&vcc_io>;
8383
};
8484

85-
vcc_io: vcc-io {
85+
vcc_io: regulator-vcc-io {
8686
compatible = "regulator-fixed";
8787
regulator-name = "vcc_io";
8888
regulator-always-on;
@@ -92,14 +92,14 @@
9292
vin-supply = <&vcc5v0_sys>;
9393
};
9494

95-
vcc_phy: vcc-phy-regulator {
95+
vcc_phy: regulator-vcc-phy-regulator {
9696
compatible = "regulator-fixed";
9797
regulator-name = "vcc_phy";
9898
regulator-always-on;
9999
regulator-boot-on;
100100
};
101101

102-
vcc5v0_otg: vcc5v0-otg {
102+
vcc5v0_otg: regulator-vcc5v0-otg {
103103
compatible = "regulator-fixed";
104104
regulator-name = "vcc5v0_otg";
105105
regulator-always-on;
@@ -312,6 +312,7 @@
312312
};
313313

314314
&usb20_otg {
315+
dr_mode = "peripheral";
315316
status = "okay";
316317
};
317318

@@ -324,7 +325,7 @@
324325
};
325326

326327
&u2phy_host {
327-
state = "okay";
328+
status = "okay";
328329
};
329330

330331
&usb_host_ehci {

0 commit comments

Comments
 (0)