Unverified Commit fdabd4b2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes-6.9' of... 

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/20240421124824.960096-1-claudiu.beznea@tuxon.dev


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 14e9d449 1fe5e0a3

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

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ vddcore: VDD_CORE { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1150000>;

						regulator-suspend-microvolt = <1150000>;

						regulator-mode = <4>;

					};
@@ -263,7 +263,7 @@ vddcpu: VDD_OTHER { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1050000>;

						regulator-suspend-microvolt = <1050000>;

						regulator-mode = <4>;

					};
@@ -280,7 +280,7 @@ vldo1: LDO1 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};
@@ -296,7 +296,7 @@ vldo2: LDO2 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <3300000>;

						regulator-suspend-microvolt = <3300000>;

						regulator-on-in-suspend;

					};

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

+4 −4
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ vddcore: VDD_CORE { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1150000>;

						regulator-suspend-microvolt = <1150000>;

						regulator-mode = <4>;

					};
@@ -314,7 +314,7 @@ vddcpu: VDD_OTHER { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1050000>;

						regulator-suspend-microvolt = <1050000>;

						regulator-mode = <4>;

					};
@@ -331,7 +331,7 @@ vldo1: LDO1 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};
@@ -346,7 +346,7 @@ vldo2: LDO2 { 
					regulator-max-microvolt = <3700000>;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};