Skip to content

Commit fdabd4b

Browse files
committed
Merge tag 'at91-fixes-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into for-next
AT91 fixes for 6.9 It contains: - fixes for regulator nodes on SAMA7G5 based boards: proper DT property is used to setup regulators suspend voltage. * tag 'at91-fixes-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property ARM: dts: microchip: at91-sama7g5ek: Replace regulator-suspend-voltage with the valid property Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 14e9d44 + 1fe5e0a commit fdabd4b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242

243243
regulator-state-standby {
244244
regulator-on-in-suspend;
245-
regulator-suspend-voltage = <1150000>;
245+
regulator-suspend-microvolt = <1150000>;
246246
regulator-mode = <4>;
247247
};
248248

@@ -263,7 +263,7 @@
263263

264264
regulator-state-standby {
265265
regulator-on-in-suspend;
266-
regulator-suspend-voltage = <1050000>;
266+
regulator-suspend-microvolt = <1050000>;
267267
regulator-mode = <4>;
268268
};
269269

@@ -280,7 +280,7 @@
280280
regulator-always-on;
281281

282282
regulator-state-standby {
283-
regulator-suspend-voltage = <1800000>;
283+
regulator-suspend-microvolt = <1800000>;
284284
regulator-on-in-suspend;
285285
};
286286

@@ -296,7 +296,7 @@
296296
regulator-always-on;
297297

298298
regulator-state-standby {
299-
regulator-suspend-voltage = <3300000>;
299+
regulator-suspend-microvolt = <3300000>;
300300
regulator-on-in-suspend;
301301
};
302302

arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293

294294
regulator-state-standby {
295295
regulator-on-in-suspend;
296-
regulator-suspend-voltage = <1150000>;
296+
regulator-suspend-microvolt = <1150000>;
297297
regulator-mode = <4>;
298298
};
299299

@@ -314,7 +314,7 @@
314314

315315
regulator-state-standby {
316316
regulator-on-in-suspend;
317-
regulator-suspend-voltage = <1050000>;
317+
regulator-suspend-microvolt = <1050000>;
318318
regulator-mode = <4>;
319319
};
320320

@@ -331,7 +331,7 @@
331331
regulator-always-on;
332332

333333
regulator-state-standby {
334-
regulator-suspend-voltage = <1800000>;
334+
regulator-suspend-microvolt = <1800000>;
335335
regulator-on-in-suspend;
336336
};
337337

@@ -346,7 +346,7 @@
346346
regulator-max-microvolt = <3700000>;
347347

348348
regulator-state-standby {
349-
regulator-suspend-voltage = <1800000>;
349+
regulator-suspend-microvolt = <1800000>;
350350
regulator-on-in-suspend;
351351
};
352352

0 commit comments

Comments
 (0)