Unverified Commit 194bebfe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'at91-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes

AT91 fixes for 6.0

It contains:
- fixes for self-refresh on SAMA7G5 while in AT91 power management modes:
  one disabling a DDR PHY controller DLL which has been proved to be buggy
  and can introduce glitches that can cause unexpected behavior; one
  fixing the DDR PHY recalibration which cannot work for all possible
  cases (due to hardware bug) while using backup and self-refresh AT91
  power management mode;
- one defconfig fix to remove CONFIG_MICROCHIP_PIT64B from all AT91
  defconfigs;
- multiple device tree fixes for regulators to avoid having some of them
  enabled all the time and to describe min and max output ranges
  according to board capabilities.

* tag 'at91-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time
  ARM: dts: at91: sama5d27_wlsom1: don't keep ldo2 enabled all the time
  ARM: dts: at91: sama7g5ek: specify proper regulator output ranges
  ARM: dts: at91: sama5d2_icp: specify proper regulator output ranges
  ARM: dts: at91: sama5d27_wlsom1: specify proper regulator output ranges
  ARM: at91: pm: fix DDR recalibration when resuming from backup and self-refresh
  ARM: at91: pm: fix self-refresh for sama7g5
  ARM: configs: at91: remove CONFIG_MICROCHIP_PIT64B

Link: https://lore.kernel.org/r/20220902085744.4193554-1-claudiu.beznea@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9a472613 3d074b75

arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi

+10 −11
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ 
		regulators {

			vdd_3v3: VDD_IO {

				regulator-name = "VDD_IO";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -95,8 +95,8 @@ 


			vddio_ddr: VDD_DDR {

				regulator-name = "VDD_DDR";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1850000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -118,8 +118,8 @@ 


			vdd_core: VDD_CORE {

				regulator-name = "VDD_CORE";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1850000>;

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <1250000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -160,8 +160,8 @@ 


			LDO1 {

				regulator-name = "LDO1";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;



				regulator-state-standby {
@@ -175,9 +175,8 @@ 


			LDO2 {

				regulator-name = "LDO2";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-always-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;



				regulator-state-standby {

					regulator-on-in-suspend;

arch/arm/boot/dts/at91-sama5d2_icp.dts

+10 −11
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ 
			regulators {

				vdd_io_reg: VDD_IO {

					regulator-name = "VDD_IO";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -215,8 +215,8 @@ 


				VDD_DDR {

					regulator-name = "VDD_DDR";

					regulator-min-microvolt = <600000>;

					regulator-max-microvolt = <1850000>;

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -234,8 +234,8 @@ 


				VDD_CORE {

					regulator-name = "VDD_CORE";

					regulator-min-microvolt = <600000>;

					regulator-max-microvolt = <1850000>;

					regulator-min-microvolt = <1250000>;

					regulator-max-microvolt = <1250000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -257,7 +257,6 @@ 
					regulator-max-microvolt = <1850000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;



					regulator-state-standby {

						regulator-on-in-suspend;
@@ -272,8 +271,8 @@ 


				LDO1 {

					regulator-name = "LDO1";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <2500000>;

					regulator-max-microvolt = <2500000>;

					regulator-always-on;



					regulator-state-standby {
@@ -287,8 +286,8 @@ 


				LDO2 {

					regulator-name = "LDO2";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;



					regulator-state-standby {

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

+9 −9
Original line number Diff line number Diff line
@@ -244,8 +244,8 @@ 
			regulators {

				vdd_3v3: VDD_IO {

					regulator-name = "VDD_IO";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -264,8 +264,8 @@ 


				vddioddr: VDD_DDR {

					regulator-name = "VDD_DDR";

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1450000>;

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -285,8 +285,8 @@ 


				vddcore: VDD_CORE {

					regulator-name = "VDD_CORE";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1850000>;

					regulator-min-microvolt = <1150000>;

					regulator-max-microvolt = <1150000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -306,7 +306,7 @@ 
				vddcpu: VDD_OTHER {

					regulator-name = "VDD_OTHER";

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1850000>;

					regulator-max-microvolt = <1250000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-ramp-delay = <3125>;
@@ -326,8 +326,8 @@ 


				vldo1: LDO1 {

					regulator-name = "LDO1";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;



					regulator-state-standby {

arch/arm/configs/at91_dt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ CONFIG_RTC_DRV_AT91SAM9=y 
CONFIG_DMADEVICES=y

CONFIG_AT_HDMAC=y

CONFIG_AT_XDMAC=y

CONFIG_MICROCHIP_PIT64B=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_AT91_ADC=y

arch/arm/configs/sama7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ CONFIG_RTC_DRV_AT91SAM9=y 
CONFIG_DMADEVICES=y

CONFIG_AT_XDMAC=y

CONFIG_STAGING=y

CONFIG_MICROCHIP_PIT64B=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_IIO_SW_TRIGGER=y