Skip to content

Commit 2c3944d

Browse files
Johan Jonkermmind
Johan Jonker
authored and
mmind
committed
ARM: 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/cfc3cfe1-086b-48f1-9b89-f17c9391d3cc@gmail.com [Also include the backlight-regulator and panel-regulator from rk3288-veyron-edp, and adapt the Pinky device accordingly] Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent bdb2696 commit 2c3944d

40 files changed

Lines changed: 158 additions & 158 deletions

‎arch/arm/boot/dts/rockchip/rk3036-kylin.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
};
8181
};
8282

83-
vcc_sys: vsys-regulator {
83+
vcc_sys: regulator-vsys {
8484
compatible = "regulator-fixed";
8585
regulator-name = "vcc_sys";
8686
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
reg = <0x60000000 0x40000000>;
2323
};
2424

25-
vdd_log: vdd-log {
25+
vdd_log: regulator-vdd-log {
2626
compatible = "pwm-regulator";
2727
pwms = <&pwm3 0 1000>;
2828
regulator-name = "vdd_log";
@@ -34,7 +34,7 @@
3434
status = "okay";
3535
};
3636

37-
vcc_sd0: fixed-regulator {
37+
vcc_sd0: regulator-fixed {
3838
compatible = "regulator-fixed";
3939
regulator-name = "sdmmc-supply";
4040
regulator-min-microvolt = <3000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
reg = <0x60000000 0x40000000>;
2020
};
2121

22-
vdd_log: vdd-log {
22+
vdd_log: regulator-vdd-log {
2323
compatible = "pwm-regulator";
2424
pwms = <&pwm3 0 1000>;
2525
regulator-name = "vdd_log";
@@ -31,7 +31,7 @@
3131
status = "okay";
3232
};
3333

34-
vcc_sd0: sdmmc-regulator {
34+
vcc_sd0: regulator-sdmmc {
3535
compatible = "regulator-fixed";
3636
regulator-name = "sdmmc-supply";
3737
regulator-min-microvolt = <3000000>;
@@ -41,7 +41,7 @@
4141
vin-supply = <&vcc_io>;
4242
};
4343

44-
vsys: vsys-regulator {
44+
vsys: regulator-vsys {
4545
compatible = "regulator-fixed";
4646
regulator-name = "vsys";
4747
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rockchip/rk3066a-mk808.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@
6161
};
6262
};
6363

64-
vcc_2v5: vcc-2v5 {
64+
vcc_2v5: regulator-vcc-2v5 {
6565
compatible = "regulator-fixed";
6666
regulator-name = "vcc_2v5";
6767
regulator-min-microvolt = <2500000>;
6868
regulator-max-microvolt = <2500000>;
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>;
7575
regulator-max-microvolt = <3300000>;
7676
};
7777

78-
vcc_host: usb-host-regulator {
78+
vcc_host: regulator-usb-host {
7979
compatible = "regulator-fixed";
8080
enable-active-high;
8181
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -89,7 +89,7 @@
8989
vin-supply = <&vcc_io>;
9090
};
9191

92-
vcc_otg: usb-otg-regulator {
92+
vcc_otg: regulator-usb-otg {
9393
compatible = "regulator-fixed";
9494
enable-active-high;
9595
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -103,7 +103,7 @@
103103
vin-supply = <&vcc_io>;
104104
};
105105

106-
vcc_sd: sdmmc-regulator {
106+
vcc_sd: regulator-sdmmc {
107107
compatible = "regulator-fixed";
108108
gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
109109
pinctrl-0 = <&sdmmc_pwr>;
@@ -115,7 +115,7 @@
115115
vin-supply = <&vcc_io>;
116116
};
117117

118-
vcc_wifi: sdio-regulator {
118+
vcc_wifi: regulator-sdio {
119119
compatible = "regulator-fixed";
120120
enable-active-high;
121121
gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;

‎arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
};
4343
};
4444

45-
vdd_log: vdd-log {
45+
vdd_log: regulator-vdd-log {
4646
compatible = "pwm-regulator";
4747
pwms = <&pwm3 0 1000>;
4848
regulator-name = "vdd_log";
@@ -54,7 +54,7 @@
5454
status = "okay";
5555
};
5656

57-
vsys: vsys-regulator {
57+
vsys: regulator-vsys {
5858
compatible = "regulator-fixed";
5959
regulator-name = "vsys";
6060
regulator-min-microvolt = <5000000>;
@@ -64,7 +64,7 @@
6464
};
6565

6666
/* input for 5V_STDBY is VSYS or DC5V, selectable by jumper J4 */
67-
vcc_stdby: stdby-regulator {
67+
vcc_stdby: regulator-stdby {
6868
compatible = "regulator-fixed";
6969
regulator-name = "5v_stdby";
7070
regulator-min-microvolt = <5000000>;
@@ -73,15 +73,15 @@
7373
regulator-boot-on;
7474
};
7575

76-
vcc_emmc: emmc-regulator {
76+
vcc_emmc: regulator-emmc {
7777
compatible = "regulator-fixed";
7878
regulator-name = "emmc_vccq";
7979
regulator-min-microvolt = <3000000>;
8080
regulator-max-microvolt = <3000000>;
8181
vin-supply = <&vsys>;
8282
};
8383

84-
vcc_sata: sata-regulator {
84+
vcc_sata: regulator-sata {
8585
compatible = "regulator-fixed";
8686
enable-active-high;
8787
gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
@@ -94,7 +94,7 @@
9494
vin-supply = <&vcc_stdby>;
9595
};
9696

97-
vcc_sd: sdmmc-regulator {
97+
vcc_sd: regulator-sdmmc {
9898
compatible = "regulator-fixed";
9999
gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
100100
pinctrl-names = "default";
@@ -106,7 +106,7 @@
106106
vin-supply = <&vcc_io>;
107107
};
108108

109-
vcc_host: usb-host-regulator {
109+
vcc_host: regulator-usb-host {
110110
compatible = "regulator-fixed";
111111
enable-active-high;
112112
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -119,7 +119,7 @@
119119
vin-supply = <&vcc_stdby>;
120120
};
121121

122-
vcc_otg: usb-otg-regulator {
122+
vcc_otg: regulator-usb-otg {
123123
compatible = "regulator-fixed";
124124
enable-active-high;
125125
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

‎arch/arm/boot/dts/rockchip/rk3128-evb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
reg = <0x60000000 0x40000000>;
2525
};
2626

27-
vcc5v0_otg: vcc5v0-otg-regulator {
27+
vcc5v0_otg: regulator-vcc5v0-otg {
2828
compatible = "regulator-fixed";
2929
gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
3030
pinctrl-names = "default";
@@ -34,7 +34,7 @@
3434
regulator-max-microvolt = <5000000>;
3535
};
3636

37-
vcc5v0_host: vcc5v0-host-regulator {
37+
vcc5v0_host: regulator-vcc5v0-host {
3838
compatible = "regulator-fixed";
3939
gpio = <&gpio2 23 GPIO_ACTIVE_HIGH>;
4040
pinctrl-names = "default";

‎arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
};
3939
};
4040

41-
dc_5v: dc-5v-regulator {
41+
dc_5v: regulator-dc-5v {
4242
compatible = "regulator-fixed";
4343
regulator-name = "DC_5V";
4444
regulator-min-microvolt = <5000000>;
@@ -62,7 +62,7 @@
6262
* This is a vbus-supply, which also supplies the GL852G usb hub,
6363
* thus has to be always-on
6464
*/
65-
host_pwr_5v: host-pwr-5v-regulator {
65+
host_pwr_5v: regulator-host-pwr-5v {
6666
compatible = "regulator-fixed";
6767
gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
6868
startup-delay-us = <1500>;
@@ -111,7 +111,7 @@
111111
};
112112
};
113113

114-
mcu3v3: mcu3v3-regulator {
114+
mcu3v3: regulator-mcu3v3 {
115115
compatible = "regulator-fixed";
116116
regulator-name = "MCU3V3";
117117
regulator-min-microvolt = <3300000>;
@@ -121,7 +121,7 @@
121121
regulator-boot-on;
122122
};
123123

124-
vcc_ddr: vcc-ddr-regulator {
124+
vcc_ddr: regulator-vcc-ddr {
125125
compatible = "regulator-fixed";
126126
regulator-name = "VCC_DDR";
127127
regulator-min-microvolt = <1500000>;
@@ -131,7 +131,7 @@
131131
regulator-boot-on;
132132
};
133133

134-
vcc_io: vcc-io-regulator {
134+
vcc_io: regulator-vcc-io {
135135
compatible = "regulator-fixed";
136136
regulator-name = "VCC_IO";
137137
regulator-min-microvolt = <3300000>;
@@ -141,7 +141,7 @@
141141
regulator-boot-on;
142142
};
143143

144-
vcc_lan: vcc-lan-regulator {
144+
vcc_lan: regulator-vcc-lan {
145145
compatible = "regulator-fixed";
146146
regulator-name = "VCC_LAN";
147147
regulator-min-microvolt = <3300000>;
@@ -151,7 +151,7 @@
151151
regulator-boot-on;
152152
};
153153

154-
vcc_sd: vcc-sd-regulator {
154+
vcc_sd: regulator-vcc-sd {
155155
compatible = "regulator-fixed";
156156
gpio = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
157157
startup-delay-us = <500>;
@@ -163,7 +163,7 @@
163163
pinctrl-0 = <&sdmmc_pwren>;
164164
};
165165

166-
vcc_sys: vcc-sys-regulator {
166+
vcc_sys: regulator-vcc-sys {
167167
compatible = "regulator-fixed";
168168
regulator-name = "VCC_SYS";
169169
regulator-min-microvolt = <5000000>;
@@ -173,7 +173,7 @@
173173
regulator-boot-on;
174174
};
175175

176-
vcc33_hdmi: vcc33-hdmi-regulator {
176+
vcc33_hdmi: regulator-vcc33-hdmi {
177177
compatible = "regulator-fixed";
178178
regulator-name = "VCC33_HDMI";
179179
regulator-min-microvolt = <3300000>;
@@ -183,7 +183,7 @@
183183
regulator-boot-on;
184184
};
185185

186-
vcca_33: vcca-33-regulator {
186+
vcca_33: regulator-vcca-33 {
187187
compatible = "regulator-fixed";
188188
regulator-name = "VCCA_33";
189189
regulator-min-microvolt = <3300000>;
@@ -193,7 +193,7 @@
193193
regulator-boot-on;
194194
};
195195

196-
vdd_11: vdd-11-regulator {
196+
vdd_11: regulator-vdd-11 {
197197
compatible = "regulator-fixed";
198198
regulator-name = "VDD_11";
199199
regulator-min-microvolt = <1100000>;
@@ -203,7 +203,7 @@
203203
regulator-boot-on;
204204
};
205205

206-
vdd11_hdmi: vdd11-hdmi-regulator {
206+
vdd11_hdmi: regulator-vdd11-hdmi {
207207
compatible = "regulator-fixed";
208208
regulator-name = "VDD11_HDMI";
209209
regulator-min-microvolt = <1100000>;
@@ -213,7 +213,7 @@
213213
regulator-boot-on;
214214
};
215215

216-
vdd_arm: vdd-arm-regulator {
216+
vdd_arm: regulator-vdd-arm {
217217
compatible = "pwm-regulator";
218218
regulator-name = "VDD_ARM";
219219
pwms = <&pwm1 0 25000 1>;
@@ -231,7 +231,7 @@
231231
* driver does not implement regulator support we have to make
232232
* sure here that the voltage never drops below 1050 mV.
233233
*/
234-
vdd_log: vdd-log-regulator {
234+
vdd_log: regulator-vdd-log {
235235
compatible = "pwm-regulator";
236236
regulator-name = "VDD_LOG";
237237
pwms = <&pwm2 0 25000 1>;

‎arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_LOW>;
131131
};
132132

133-
avdd_cif: cif-avdd-regulator {
133+
avdd_cif: regulator-cif-avdd {
134134
compatible = "regulator-fixed";
135135
regulator-name = "avdd-cif";
136136
regulator-min-microvolt = <2800000>;
@@ -142,7 +142,7 @@
142142
vin-supply = <&vcc28_cif>;
143143
};
144144

145-
vcc_5v: vcc-5v-regulator {
145+
vcc_5v: regulator-vcc-5v {
146146
compatible = "regulator-fixed";
147147
regulator-name = "vcc-5v";
148148
regulator-min-microvolt = <5000000>;
@@ -154,7 +154,7 @@
154154
vin-supply = <&vsys>;
155155
};
156156

157-
vcc_lcd: lcd-regulator {
157+
vcc_lcd: regulator-lcd {
158158
compatible = "regulator-fixed";
159159
regulator-name = "vcc-lcd";
160160
gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>;
@@ -164,7 +164,7 @@
164164
vin-supply = <&vcc_io>;
165165
};
166166

167-
vcc_otg: usb-otg-regulator {
167+
vcc_otg: regulator-usb-otg {
168168
compatible = "regulator-fixed";
169169
regulator-name = "vcc-otg";
170170
regulator-min-microvolt = <5000000>;
@@ -177,7 +177,7 @@
177177
vin-supply = <&vcc_5v>;
178178
};
179179

180-
vcc_sd: sdmmc-regulator {
180+
vcc_sd: regulator-sdmmc {
181181
compatible = "regulator-fixed";
182182
regulator-name = "vcc-sd";
183183
regulator-min-microvolt = <3300000>;
@@ -189,7 +189,7 @@
189189
vin-supply = <&vcc_io>;
190190
};
191191

192-
vccq_emmc: emmc-vccq-regulator {
192+
vccq_emmc: regulator-emmc-vccq {
193193
compatible = "regulator-fixed";
194194
regulator-name = "vccq-emmc";
195195
regulator-min-microvolt = <2800000>;
@@ -198,7 +198,7 @@
198198
};
199199

200200
/* supplied from the bq24196 */
201-
vsys: vsys-regulator {
201+
vsys: regulator-vsys {
202202
compatible = "regulator-fixed";
203203
regulator-name = "vsys";
204204
regulator-min-microvolt = <5000000>;

‎arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
};
4040
};
4141

42-
vcc_sys: vsys-regulator {
42+
vcc_sys: regulator-vsys {
4343
compatible = "regulator-fixed";
4444
regulator-name = "vsys";
4545
regulator-min-microvolt = <5000000>;

0 commit comments

Comments
 (0)