Skip to content

Commit 5c96e63

Browse files
Johan Jonkermmind
Johan Jonker
authored and
mmind
committed
arm64: dts: rockchip: adapt regulator nodenames to preferred form
The preferred nodename for fixed-regulators has changed to pattern: '^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$' Fix all Rockchip DT regulator nodenames. Signed-off-by: Johan Jonker <jbx6244@gmail.com> Link: https://lore.kernel.org/r/0ae40493-93e9-40cd-9ca9-990ae064f21a@gmail.com [adapted rebased on top of a number of other changes and included neu6a-wifi + wolfvision-pf5-io-expander overlays] Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 3fb369c commit 5c96e63

114 files changed

Lines changed: 634 additions & 634 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
mmc2 = &sdio;
1313
};
1414

15-
vcc5v0_sys: vcc5v0-sys {
15+
vcc5v0_sys: regulator-vcc5v0-sys {
1616
compatible = "regulator-fixed";
1717
regulator-name = "vcc5v0_sys"; /* +5V */
1818
regulator-always-on;
@@ -42,7 +42,7 @@
4242
states = <3300000 0x0>;
4343
};
4444

45-
vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {
45+
vcc3v3_rf_aux_mod: regulator-vcc3v3-rf-aux-mod {
4646
compatible = "regulator-fixed";
4747
regulator-name = "vcc3v3_rf_aux_mod";
4848
regulator-min-microvolt = <3300000>;

‎arch/arm64/boot/dts/rockchip/px30-evb.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
9090
};
9191

92-
vcc5v0_sys: vccsys {
92+
vcc5v0_sys: regulator-vccsys {
9393
compatible = "regulator-fixed";
9494
regulator-name = "vcc5v0_sys";
9595
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
stdout-path = "serial2:115200n8";
2525
};
2626

27-
dc_12v: dc-12v-regulator {
27+
dc_12v: regulator-dc-12v {
2828
compatible = "regulator-fixed";
2929
regulator-name = "dc_12v";
3030
regulator-always-on;
@@ -85,7 +85,7 @@
8585
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
8686
};
8787

88-
vcc5v0_baseboard: vcc5v0-baseboard-regulator {
88+
vcc5v0_baseboard: regulator-vcc5v0-baseboard {
8989
compatible = "regulator-fixed";
9090
regulator-name = "vcc5v0_baseboard";
9191
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
reset-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
1818
};
1919

20-
vcc5v0_sys: vcc5v0-sys-regulator {
20+
vcc5v0_sys: regulator-vcc5v0-sys {
2121
compatible = "regulator-fixed";
2222
regulator-name = "vcc5v0_sys";
2323
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
clock-frequency = <24576000>;
9191
};
9292

93-
dc_12v: dc-12v-regulator {
93+
dc_12v: regulator-dc-12v {
9494
compatible = "regulator-fixed";
9595
regulator-name = "dc_12v";
9696
regulator-always-on;
@@ -99,7 +99,7 @@
9999
regulator-max-microvolt = <12000000>;
100100
};
101101

102-
vcc3v3_baseboard: vcc3v3-baseboard-regulator {
102+
vcc3v3_baseboard: regulator-vcc3v3-baseboard {
103103
compatible = "regulator-fixed";
104104
regulator-name = "vcc3v3_baseboard";
105105
regulator-always-on;
@@ -109,7 +109,7 @@
109109
vin-supply = <&dc_12v>;
110110
};
111111

112-
vcc5v0_baseboard: vcc5v0-baseboard-regulator {
112+
vcc5v0_baseboard: regulator-vcc5v0-baseboard {
113113
compatible = "regulator-fixed";
114114
regulator-name = "vcc5v0_baseboard";
115115
regulator-always-on;
@@ -119,7 +119,7 @@
119119
vin-supply = <&dc_12v>;
120120
};
121121

122-
vdda_codec: vdda-codec-regulator {
122+
vdda_codec: regulator-vdda-codec {
123123
compatible = "regulator-fixed";
124124
regulator-name = "vdda_codec";
125125
regulator-boot-on;
@@ -128,7 +128,7 @@
128128
vin-supply = <&vcc5v0_baseboard>;
129129
};
130130

131-
vddd_codec: vddd-codec-regulator {
131+
vddd_codec: regulator-vddd-codec {
132132
compatible = "regulator-fixed";
133133
regulator-name = "vddd_codec";
134134
regulator-boot-on;

‎arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
};
4444
};
4545

46-
vcc5v0_sys: vccsys-regulator {
46+
vcc5v0_sys: regulator-vccsys {
4747
compatible = "regulator-fixed";
4848
regulator-name = "vcc5v0_sys";
4949
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/rk3308-evb.dts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
};
8585
};
8686

87-
vcc12v_dcin: vcc12v-dcin {
87+
vcc12v_dcin: regulator-vcc12v-dcin {
8888
compatible = "regulator-fixed";
8989
regulator-name = "vcc12v_dcin";
9090
regulator-min-microvolt = <12000000>;
@@ -93,7 +93,7 @@
9393
regulator-boot-on;
9494
};
9595

96-
vcc5v0_sys: vcc5v0-sys {
96+
vcc5v0_sys: regulator-vcc5v0-sys {
9797
compatible = "regulator-fixed";
9898
regulator-name = "vcc5v0_sys";
9999
regulator-min-microvolt = <5000000>;
@@ -103,7 +103,7 @@
103103
vin-supply = <&vcc12v_dcin>;
104104
};
105105

106-
vccio_sdio: vcc_1v8: vcc-1v8 {
106+
vccio_sdio: vcc_1v8: regulator-vcc-1v8 {
107107
compatible = "regulator-fixed";
108108
regulator-name = "vcc_1v8";
109109
regulator-min-microvolt = <1800000>;
@@ -113,7 +113,7 @@
113113
vin-supply = <&vcc_io>;
114114
};
115115

116-
vcc_ddr: vcc-ddr {
116+
vcc_ddr: regulator-vcc-ddr {
117117
compatible = "regulator-fixed";
118118
regulator-name = "vcc_ddr";
119119
regulator-min-microvolt = <1500000>;
@@ -123,7 +123,7 @@
123123
vin-supply = <&vcc5v0_sys>;
124124
};
125125

126-
vcc_io: vcc-io {
126+
vcc_io: regulator-vcc-io {
127127
compatible = "regulator-fixed";
128128
regulator-name = "vcc_io";
129129
regulator-min-microvolt = <3300000>;
@@ -133,7 +133,7 @@
133133
vin-supply = <&vcc5v0_sys>;
134134
};
135135

136-
vccio_flash: vccio-flash {
136+
vccio_flash: regulator-vccio-flash {
137137
compatible = "regulator-fixed";
138138
regulator-name = "vccio_flash";
139139
regulator-min-microvolt = <3300000>;
@@ -143,7 +143,7 @@
143143
vin-supply = <&vcc_io>;
144144
};
145145

146-
vcc5v0_host: vcc5v0-host {
146+
vcc5v0_host: regulator-vcc5v0-host {
147147
compatible = "regulator-fixed";
148148
gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
149149
enable-active-high;
@@ -153,7 +153,7 @@
153153
vin-supply = <&vcc5v0_sys>;
154154
};
155155

156-
vdd_core: vdd-core {
156+
vdd_core: regulator-vdd-core {
157157
compatible = "pwm-regulator";
158158
pwms = <&pwm0 0 5000 1>;
159159
regulator-name = "vdd_core";
@@ -165,7 +165,7 @@
165165
pwm-supply = <&vcc5v0_sys>;
166166
};
167167

168-
vdd_log: vdd-log {
168+
vdd_log: regulator-vdd-log {
169169
compatible = "regulator-fixed";
170170
regulator-name = "vdd_log";
171171
regulator-min-microvolt = <1050000>;
@@ -175,7 +175,7 @@
175175
vin-supply = <&vcc5v0_sys>;
176176
};
177177

178-
vdd_1v0: vdd-1v0 {
178+
vdd_1v0: regulator-vdd-1v0 {
179179
compatible = "regulator-fixed";
180180
regulator-name = "vdd_1v0";
181181
regulator-min-microvolt = <1000000>;

‎arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
};
5050
};
5151

52-
typec_vcc5v: typec-vcc5v {
52+
typec_vcc5v: regulator-typec-vcc5v {
5353
compatible = "regulator-fixed";
5454
regulator-name = "typec_vcc5v";
5555
regulator-min-microvolt = <5000000>;
@@ -58,7 +58,7 @@
5858
regulator-boot-on;
5959
};
6060

61-
vcc5v0_sys: vcc5v0-sys {
61+
vcc5v0_sys: regulator-vcc5v0-sys {
6262
compatible = "regulator-fixed";
6363
regulator-name = "vcc5v0_sys";
6464
regulator-min-microvolt = <5000000>;
@@ -68,7 +68,7 @@
6868
vin-supply = <&typec_vcc5v>;
6969
};
7070

71-
vcc_io: vcc-io {
71+
vcc_io: regulator-vcc-io {
7272
compatible = "regulator-fixed";
7373
regulator-name = "vcc_io";
7474
regulator-min-microvolt = <3300000>;
@@ -89,7 +89,7 @@
8989
vin-supply = <&vcc5v0_sys>;
9090
};
9191

92-
vcc_sd: vcc-sd {
92+
vcc_sd: regulator-vcc-sd {
9393
compatible = "regulator-fixed";
9494
gpio = <&gpio4 RK_PD6 GPIO_ACTIVE_LOW>;
9595
regulator-name = "vcc_sd";
@@ -100,7 +100,7 @@
100100
vin-supply = <&vcc_io>;
101101
};
102102

103-
vdd_core: vdd-core {
103+
vdd_core: regulator-vdd-core {
104104
compatible = "pwm-regulator";
105105
pwms = <&pwm0 0 5000 1>;
106106
regulator-name = "vdd_core";
@@ -112,7 +112,7 @@
112112
pwm-supply = <&vcc5v0_sys>;
113113
};
114114

115-
vdd_log: vdd-log {
115+
vdd_log: regulator-vdd-log {
116116
compatible = "regulator-fixed";
117117
regulator-name = "vdd_log";
118118
regulator-min-microvolt = <1050000>;

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
5656
};
5757

58-
vcc_1v8: vcc-1v8 {
58+
vcc_1v8: regulator-vcc-1v8 {
5959
compatible = "regulator-fixed";
6060
regulator-name = "vcc_1v8";
6161
regulator-always-on;
@@ -65,7 +65,7 @@
6565
vin-supply = <&vcc_io>;
6666
};
6767

68-
vcc_io: vcc-io {
68+
vcc_io: regulator-vcc-io {
6969
compatible = "regulator-fixed";
7070
regulator-name = "vcc_io";
7171
regulator-always-on;
@@ -75,7 +75,7 @@
7575
vin-supply = <&vcc5v0_sys>;
7676
};
7777

78-
vcc_ddr: vcc-ddr {
78+
vcc_ddr: regulator-vcc-ddr {
7979
compatible = "regulator-fixed";
8080
regulator-name = "vcc_ddr";
8181
regulator-always-on;
@@ -85,7 +85,7 @@
8585
vin-supply = <&vcc5v0_sys>;
8686
};
8787

88-
vcc5v0_otg: vcc5v0-otg {
88+
vcc5v0_otg: regulator-vcc5v0-otg {
8989
compatible = "regulator-fixed";
9090
enable-active-high;
9191
gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
@@ -96,7 +96,7 @@
9696
vin-supply = <&vcc5v0_sys>;
9797
};
9898

99-
vcc5v0_sys: vcc5v0-sys {
99+
vcc5v0_sys: regulator-vcc5v0-sys {
100100
compatible = "regulator-fixed";
101101
regulator-name = "vcc5v0_sys";
102102
regulator-always-on;
@@ -105,7 +105,7 @@
105105
regulator-max-microvolt = <5000000>;
106106
};
107107

108-
vdd_core: vdd-core {
108+
vdd_core: regulator-vdd-core {
109109
compatible = "pwm-regulator";
110110
pwms = <&pwm0 0 5000 1>;
111111
pwm-supply = <&vcc5v0_sys>;
@@ -117,7 +117,7 @@
117117
regulator-boot-on;
118118
};
119119

120-
vdd_log: vdd-log {
120+
vdd_log: regulator-vdd-log {
121121
compatible = "regulator-fixed";
122122
regulator-name = "vdd_log";
123123
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@
7878
};
7979

8080
/* Power tree */
81-
vccio_1v8: vccio-1v8-regulator {
81+
vccio_1v8: regulator-vccio-1v8 {
8282
compatible = "regulator-fixed";
8383
regulator-name = "vccio_1v8";
8484
regulator-min-microvolt = <1800000>;
8585
regulator-max-microvolt = <1800000>;
8686
regulator-always-on;
8787
};
8888

89-
vccio_3v3: vccio-3v3-regulator {
89+
vccio_3v3: regulator-vccio-3v3 {
9090
compatible = "regulator-fixed";
9191
regulator-name = "vccio_3v3";
9292
regulator-min-microvolt = <3300000>;
9393
regulator-max-microvolt = <3300000>;
9494
regulator-always-on;
9595
};
9696

97-
vcc_otg_vbus: otg-vbus-regulator {
97+
vcc_otg_vbus: regulator-otg-vbus {
9898
compatible = "regulator-fixed";
9999
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
100100
pinctrl-0 = <&otg_vbus_drv>;
@@ -105,7 +105,7 @@
105105
enable-active-high;
106106
};
107107

108-
vcc_sd: sdmmc-regulator {
108+
vcc_sd: regulator-sdmmc {
109109
compatible = "regulator-fixed";
110110
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
111111
pinctrl-0 = <&sdmmc0m1_pin>;
@@ -116,7 +116,7 @@
116116
vin-supply = <&vccio_3v3>;
117117
};
118118

119-
vdd_arm: vdd-arm {
119+
vdd_arm: regulator-vdd-arm {
120120
compatible = "pwm-regulator";
121121
pwms = <&pwm0 0 5000 1>;
122122
regulator-name = "vdd_arm";
@@ -127,7 +127,7 @@
127127
regulator-boot-on;
128128
};
129129

130-
vdd_log: vdd-log {
130+
vdd_log: regulator-vdd-log {
131131
compatible = "pwm-regulator";
132132
pwms = <&pwm1 0 5000 1>;
133133
regulator-name = "vdd_log";

0 commit comments

Comments
 (0)