Skip to content

Commit

Permalink
Merge tag 'at91-fixes-6.9' of https://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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/20240421124824.960096-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Apr 26, 2024
2 parents 14e9d44 + 1fe5e0a commit fdabd4b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@

regulator-state-standby {
regulator-on-in-suspend;
regulator-suspend-voltage = <1150000>;
regulator-suspend-microvolt = <1150000>;
regulator-mode = <4>;
};

Expand All @@ -263,7 +263,7 @@

regulator-state-standby {
regulator-on-in-suspend;
regulator-suspend-voltage = <1050000>;
regulator-suspend-microvolt = <1050000>;
regulator-mode = <4>;
};

Expand All @@ -280,7 +280,7 @@
regulator-always-on;

regulator-state-standby {
regulator-suspend-voltage = <1800000>;
regulator-suspend-microvolt = <1800000>;
regulator-on-in-suspend;
};

Expand All @@ -296,7 +296,7 @@
regulator-always-on;

regulator-state-standby {
regulator-suspend-voltage = <3300000>;
regulator-suspend-microvolt = <3300000>;
regulator-on-in-suspend;
};

Expand Down
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/microchip/at91-sama7g5ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@

regulator-state-standby {
regulator-on-in-suspend;
regulator-suspend-voltage = <1150000>;
regulator-suspend-microvolt = <1150000>;
regulator-mode = <4>;
};

Expand All @@ -314,7 +314,7 @@

regulator-state-standby {
regulator-on-in-suspend;
regulator-suspend-voltage = <1050000>;
regulator-suspend-microvolt = <1050000>;
regulator-mode = <4>;
};

Expand All @@ -331,7 +331,7 @@
regulator-always-on;

regulator-state-standby {
regulator-suspend-voltage = <1800000>;
regulator-suspend-microvolt = <1800000>;
regulator-on-in-suspend;
};

Expand All @@ -346,7 +346,7 @@
regulator-max-microvolt = <3700000>;

regulator-state-standby {
regulator-suspend-voltage = <1800000>;
regulator-suspend-microvolt = <1800000>;
regulator-on-in-suspend;
};

Expand Down

0 comments on commit fdabd4b

Please sign in to comment.