Skip to content

Commit 2f9eb52

Browse files
committed
arm64: dts: rockchip: fix fixed-regulator renames on rk3399-gru devices
rk3399-gru chromebooks have a regulator chains where one named regulator supplies multiple regulators pp900-usb pp900_pcie that supply the named peripherals. The dtsi used somewhat creative structure to describe that in creating the base node 3 times with different phandles and describing the EC dependency in a comment. This didn't register in the recent regulator-node renaming, as the additional nodes were empty, so adapt the missing node names for now. Fixes: 5c96e63 ("arm64: dts: rockchip: adapt regulator nodenames to preferred form") Tested-by: Vicente Bergas <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5ae4dca commit 2f9eb52

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
};
2323

2424
/* EC turns on w/ pp900_usb_en */
25-
pp900_usb: pp900-ap {
25+
pp900_usb: regulator-pp900-ap {
2626
};
2727

2828
/* EC turns on w/ pp900_pcie_en */
29-
pp900_pcie: pp900-ap {
29+
pp900_pcie: regulator-pp900-ap {
3030
};
3131

3232
pp3000: regulator-pp3000 {
@@ -126,7 +126,7 @@
126126
};
127127

128128
/* Always on; plain and simple */
129-
pp3000_ap: pp3000_emmc: pp3000 {
129+
pp3000_ap: pp3000_emmc: regulator-pp3000 {
130130
};
131131

132132
pp1500_ap_io: regulator-pp1500-ap-io {
@@ -160,7 +160,7 @@
160160
};
161161

162162
/* EC turns on w/ pp3300_usb_en_l */
163-
pp3300_usb: pp3300 {
163+
pp3300_usb: regulator-pp3300 {
164164
};
165165

166166
/* gpio is shared with pp1800_pcie and pinctrl is set there */

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
};
9393

9494
/* EC turns on pp1800_s3_en */
95-
pp1800_s3: pp1800 {
95+
pp1800_s3: regulator-pp1800 {
9696
};
9797

9898
/* pp3300 children, sorted by name */
@@ -109,11 +109,11 @@
109109
};
110110

111111
/* EC turns on pp3300_s0_en */
112-
pp3300_s0: pp3300 {
112+
pp3300_s0: regulator-pp3300 {
113113
};
114114

115115
/* EC turns on pp3300_s3_en */
116-
pp3300_s3: pp3300 {
116+
pp3300_s3: regulator-pp3300 {
117117
};
118118

119119
/*

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,39 +189,39 @@
189189
};
190190

191191
/* EC turns on w/ pp900_ddrpll_en */
192-
pp900_ddrpll: pp900-ap {
192+
pp900_ddrpll: regulator-pp900-ap {
193193
};
194194

195195
/* EC turns on w/ pp900_pll_en */
196-
pp900_pll: pp900-ap {
196+
pp900_pll: regulator-pp900-ap {
197197
};
198198

199199
/* EC turns on w/ pp900_pmu_en */
200-
pp900_pmu: pp900-ap {
200+
pp900_pmu: regulator-pp900-ap {
201201
};
202202

203203
/* EC turns on w/ pp1800_s0_en_l */
204-
pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: pp1800 {
204+
pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: regulator-pp1800 {
205205
};
206206

207207
/* EC turns on w/ pp1800_avdd_en_l */
208-
pp1800_avdd: pp1800 {
208+
pp1800_avdd: regulator-pp1800 {
209209
};
210210

211211
/* EC turns on w/ pp1800_lid_en_l */
212-
pp1800_lid: pp1800_mic: pp1800 {
212+
pp1800_lid: pp1800_mic: regulator-pp1800 {
213213
};
214214

215215
/* EC turns on w/ lpddr_pwr_en */
216-
pp1800_lpddr: pp1800 {
216+
pp1800_lpddr: regulator-pp1800 {
217217
};
218218

219219
/* EC turns on w/ pp1800_pmu_en_l */
220-
pp1800_pmu: pp1800 {
220+
pp1800_pmu: regulator-pp1800 {
221221
};
222222

223223
/* EC turns on w/ pp1800_usb_en_l */
224-
pp1800_usb: pp1800 {
224+
pp1800_usb: regulator-pp1800 {
225225
};
226226

227227
pp3000_sd_slot: regulator-pp3000-sd-slot {
@@ -259,11 +259,11 @@
259259
};
260260

261261
/* EC turns on w/ pp3300_trackpad_en_l */
262-
pp3300_trackpad: pp3300-trackpad {
262+
pp3300_trackpad: regulator-pp3300-trackpad {
263263
};
264264

265265
/* EC turns on w/ usb_a_en */
266-
pp5000_usb_a_vbus: pp5000 {
266+
pp5000_usb_a_vbus: regulator-pp5000 {
267267
};
268268

269269
ap_rtc_clk: ap-rtc-clk {

0 commit comments

Comments
 (0)