From: Claudiu Beznea <claudiu.beznea@tuxon.dev>

The LPM shutdown controller output could signal the transition to PM
state for different devices connected on board. On different boards
LPM could be connected to different devices (e.g. on SAMA7G5-EK REV4
the LPM is connected to on main crystal oscillator, KSZ8081 PHY and
to MCP16502 PMIC). Toggling LPM on BSR PM mode is done unconditionally
and it helps PMIC to transition to a power saving mode. Toggling LPM
on ULP0 and ULP1 should be done conditionally based on user defined
wakeup sources, available wakeup source for PM mode and connections to
SHDWC's LPM pin. On ULP0 any device could act as wakeup sources. On ULP1
only some of the on SoC controllers could act as wakeup sources. For this
the architecture specific PM code parses board specific LPM devices,
check them against possible wakeup source (in case of ULP1) and tells
assembly code to act properly on SHDWC's LPM pin.

Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
[ryan.wanner@microchip.com: Fixed conflicts when applying.]
Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
---
 arch/arm/mach-at91/pm.c              | 98 +++++++++++++++++++++++++++-
 arch/arm/mach-at91/pm.h              |  1 +
 arch/arm/mach-at91/pm_data-offsets.c |  1 +
 arch/arm/mach-at91/pm_suspend.S      | 50 ++++++++++++--
 4 files changed, 141 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 35058b99069c..29348d6c852b 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -116,6 +116,7 @@ struct at91_pm_quirks {
  * @config_shdwc_ws: wakeup sources configuration function for SHDWC
  * @config_pmc_ws: wakeup srouces configuration function for PMC
  * @ws_ids: wakup sources of_device_id array
+ * @shdwc_np: pointer to shdwc node
  * @bu: backup unit mapped data (for backup mode)
  * @quirks: PM quirks
  * @data: PM data to be used on last phase of suspend
@@ -126,6 +127,7 @@ struct at91_soc_pm {
 	int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity);
 	int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity);
 	const struct of_device_id *ws_ids;
+	struct device_node *shdwc_np;
 	struct at91_pm_bu *bu;
 	struct at91_pm_quirks quirks;
 	struct at91_pm_data data;
@@ -243,6 +245,84 @@ static const struct of_device_id sam9x7_ws_ids[] = {
 	{ /* sentinel */ }
 };
 
+static int at91_pm_device_in_list(const struct platform_device *pdev,
+				  const struct of_device_id *ids)
+{
+	struct platform_device *local_pdev;
+	const struct of_device_id *match;
+	struct device_node *np;
+	int in_list = 0;
+
+	for_each_matching_node_and_match(np, ids, &match) {
+		local_pdev = of_find_device_by_node(np);
+		if (!local_pdev)
+			continue;
+
+		if (pdev == local_pdev)
+			in_list = 1;
+
+		put_device(&local_pdev->dev);
+		if (in_list)
+			return in_list;
+	}
+
+	return in_list;
+}
+
+static int at91_pm_prepare_lpm(unsigned int pm_mode)
+{
+	struct platform_device *pdev;
+	int ndevices, i, ret;
+	struct of_phandle_args lpmspec;
+
+	if ((pm_mode != AT91_PM_ULP0 && pm_mode != AT91_PM_ULP1) ||
+	    !soc_pm.shdwc_np)
+		return 0;
+
+	ndevices = of_count_phandle_with_args(soc_pm.shdwc_np,
+					      "microchip,lpm-connection", 0);
+	if (ndevices < 0)
+		return 0;
+
+	soc_pm.data.lpm = 1;
+	for (i = 0; i < ndevices; i++) {
+		ret = of_parse_phandle_with_args(soc_pm.shdwc_np,
+						 "microchip,lpm-connection",
+						 NULL, i, &lpmspec);
+		if (ret < 0) {
+			if (ret == -ENOENT) {
+				continue;
+			} else {
+				soc_pm.data.lpm = 0;
+				return ret;
+			}
+		}
+
+		pdev = of_find_device_by_node(lpmspec.np);
+		if (!pdev)
+			continue;
+
+		if (device_may_wakeup(&pdev->dev)) {
+			if (pm_mode == AT91_PM_ULP1) {
+				/*
+				 * ULP1 wake-up sources are limited. Ignore it if not
+				 * in soc_pm.ws_ids.
+				 */
+				if (at91_pm_device_in_list(pdev, soc_pm.ws_ids))
+					soc_pm.data.lpm = 0;
+			} else {
+				soc_pm.data.lpm = 0;
+			}
+		}
+
+		put_device(&pdev->dev);
+		if (!soc_pm.data.lpm)
+			break;
+	}
+
+	return 0;
+}
+
 static int at91_pm_config_ws(unsigned int pm_mode, bool set)
 {
 	const struct wakeup_source_info *wsi;
@@ -481,10 +561,17 @@ static int at91_pm_begin(suspend_state_t state)
 		soc_pm.data.mode = -1;
 	}
 
-	ret = at91_pm_config_ws(soc_pm.data.mode, true);
+	ret = at91_pm_prepare_lpm(soc_pm.data.mode);
 	if (ret)
 		return ret;
 
+	ret = at91_pm_config_ws(soc_pm.data.mode, true);
+	if (ret) {
+		/* Revert LPM if any. */
+		soc_pm.data.lpm = 0;
+		return ret;
+	}
+
 	if (soc_pm.data.mode == AT91_PM_BACKUP)
 		soc_pm.bu->suspended = 1;
 	else if (soc_pm.bu)
@@ -1266,7 +1353,11 @@ static void __init at91_pm_modes_init(const u32 *maps, int len)
 			AT91_PM_REPLACE_MODES(maps, SHDWC);
 		} else {
 			soc_pm.data.shdwc = of_iomap(np, 0);
-			of_node_put(np);
+			/*
+			 * np is used further on suspend/resume path so we skip the
+			 * of_node_put(np) here.
+			 */
+			soc_pm.shdwc_np = np;
 		}
 	}
 
@@ -1669,7 +1760,8 @@ void __init sama7_pm_init(void)
 		AT91_PM_STANDBY, AT91_PM_ULP0, AT91_PM_ULP1, AT91_PM_BACKUP,
 	};
 	static const u32 iomaps[] __initconst = {
-		[AT91_PM_ULP0]		= AT91_PM_IOMAP(SFRBU),
+		[AT91_PM_ULP0]		= AT91_PM_IOMAP(SFRBU) |
+					  AT91_PM_IOMAP(SHDWC),
 		[AT91_PM_ULP1]		= AT91_PM_IOMAP(SFRBU) |
 					  AT91_PM_IOMAP(SHDWC) |
 					  AT91_PM_IOMAP(ETHC),
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 50c3a425d140..5707ff6ff444 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -40,6 +40,7 @@ struct at91_pm_data {
 	unsigned int pmc_mckr_offset;
 	unsigned int pmc_version;
 	unsigned int pmc_mcks;
+	unsigned int lpm;
 };
 #endif
 
diff --git a/arch/arm/mach-at91/pm_data-offsets.c b/arch/arm/mach-at91/pm_data-offsets.c
index 0ca5da66dc26..fb9651abdfdf 100644
--- a/arch/arm/mach-at91/pm_data-offsets.c
+++ b/arch/arm/mach-at91/pm_data-offsets.c
@@ -20,6 +20,7 @@ int main(void)
 						 pmc_version));
 	DEFINE(PM_DATA_PMC_MCKS,	offsetof(struct at91_pm_data,
 						 pmc_mcks));
+	DEFINE(PM_DATA_LPM,		offsetof(struct at91_pm_data, lpm));
 
 	return 0;
 }
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index aad53ec9e957..198236bdbbb3 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -110,9 +110,30 @@ lp_done_\ena:
 #endif
 	.endm
 
-	.macro at91_backup_set_lpm reg
+/*
+ * Set LPM
+ * @ena: 0 - disable LPM
+ *	 1 - enable LPM
+ *
+ * Side effects: overwrites r7, r8, r9
+ */
+	.macro at91_set_lpm ena
 #ifdef CONFIG_SOC_SAMA7
-	orr	\reg, \reg, #0x200000
+	ldr	r7, .lpm
+	cmp	r7, #1
+	bne	21f
+	ldr	r7, .shdwc
+	cmp	r7, #0
+	beq	21f
+	mov	r8, #0xA5000000
+	add	r8, #0x200000
+	mov	r9, #\ena
+	cmp	r9, #1
+	beq	20f
+	add	r8, #0x200000
+20:
+	str	r8, [r7]
+21:
 #endif
 	.endm
 
@@ -502,7 +523,7 @@ sr_dis_exit:
 	ldr	tmp1, [pmc, #AT91_PMC_SR]
 	str	tmp1, .saved_osc_status
 	tst	tmp1, #AT91_PMC_MOSCRCS
-	bne	1f
+	bne	7f
 
 	/* Turn off RC oscillator */
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
@@ -516,6 +537,9 @@ sr_dis_exit:
 	tst	tmp1, #AT91_PMC_MOSCRCS
 	bne	2b
 
+	/* Enable LPM. */
+7:	at91_set_lpm 1
+
 	/* Wait for interrupt */
 1:	at91_cpu_idle
 
@@ -533,8 +557,10 @@ sr_dis_exit:
 	wait_mckrdy tmp3
 	b	6f
 
-5:	/* Restore RC oscillator state */
-	ldr	tmp1, .saved_osc_status
+5:	at91_set_lpm 0
+
+	/* Restore RC oscillator state */
+8:	ldr	tmp1, .saved_osc_status
 	tst	tmp1, #AT91_PMC_MOSCRCS
 	beq	4f
 
@@ -611,6 +637,9 @@ sr_dis_exit:
 
 	wait_mckrdy tmp3
 
+	/* Enable LPM */
+	at91_set_lpm 1
+
 	/* Enter the ULP1 mode by set WAITMODE bit in CKGR_MOR */
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	orr	tmp1, tmp1, #AT91_PMC_WAITMODE
@@ -624,6 +653,9 @@ sr_dis_exit:
 
 	wait_mckrdy tmp3
 
+	/* Disable LPM. */
+	at91_set_lpm 0
+
 	/* Enable the crystal oscillator */
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	orr	tmp1, tmp1, #AT91_PMC_MOSCEN
@@ -1083,7 +1115,9 @@ ulp_exit:
 	ldr	r0, .shdwc
 	mov	tmp1, #0xA5000000
 	add	tmp1, tmp1, #0x1
-	at91_backup_set_lpm tmp1
+#ifdef CONFIG_SOC_SAMA7
+	orr	tmp1, tmp1, #0x200000
+#endif
 	str	tmp1, [r0, #0]
 .endm
 
@@ -1117,6 +1151,8 @@ ENTRY(at91_pm_suspend_in_sram)
 #ifdef CONFIG_SOC_SAMA7
 	ldr	tmp1, [r0, #PM_DATA_PMC_MCKS]
 	str	tmp1, .mcks
+	ldr	tmp1, [r0, #PM_DATA_LPM]
+	str	tmp1, .lpm
 #endif
 
 	/*
@@ -1208,6 +1244,8 @@ ENDPROC(at91_pm_suspend_in_sram)
 #ifdef CONFIG_SOC_SAMA7
 .mcks:
 	.word 0
+.lpm:
+	.word 0
 #endif
 .saved_mckr:
 	.word 0
-- 
2.43.0

Hi,

kernel test robot noticed the following build warnings:

[auto build test WARNING on soc/for-next]
[also build test WARNING on cbeznea/tests linus/master v6.17-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Ryan-Wanner-microchip-com/dt-bindings-power-reset-atmel-sama5d2-shdwc-add-lpm-binding/20250911-002354
base:   https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git for-next
patch link:    https://lore.kernel.org/r/e72d9af1326cf44888059270263afde875ccc994.1757519351.git.Ryan.Wanner%40microchip.com
patch subject: [PATCH 2/4] ARM: at91: PM: implement selection of LPM
config: arm-randconfig-r131-20250915 (https://download.01.org/0day-ci/archive/20250915/202509152248.NjJj2xwQ-lkp@intel.com/config)
compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project 21857ae337e0892a5522b6e7337899caa61de2a6)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250915/202509152248.NjJj2xwQ-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202509152248.NjJj2xwQ-lkp@intel.com/

sparse warnings: (new ones prefixed by >>)
>> arch/arm/mach-at91/pm.c:283:75: sparse: sparse: Using plain integer as NULL pointer
   arch/arm/mach-at91/pm.c:1101:30: sparse: sparse: incorrect type in assignment (different address spaces) @@     expected void ( *static [assigned] [toplevel] at91_suspend_sram_fn )( ... ) @@     got void [noderef] __iomem * @@
   arch/arm/mach-at91/pm.c:1101:30: sparse:     expected void ( *static [assigned] [toplevel] at91_suspend_sram_fn )( ... )
   arch/arm/mach-at91/pm.c:1101:30: sparse:     got void [noderef] __iomem *

vim +283 arch/arm/mach-at91/pm.c

   271	
   272	static int at91_pm_prepare_lpm(unsigned int pm_mode)
   273	{
   274		struct platform_device *pdev;
   275		int ndevices, i, ret;
   276		struct of_phandle_args lpmspec;
   277	
   278		if ((pm_mode != AT91_PM_ULP0 && pm_mode != AT91_PM_ULP1) ||
   279		    !soc_pm.shdwc_np)
   280			return 0;
   281	
   282		ndevices = of_count_phandle_with_args(soc_pm.shdwc_np,
 > 283						      "microchip,lpm-connection", 0);
   284		if (ndevices < 0)
   285			return 0;
   286	
   287		soc_pm.data.lpm = 1;
   288		for (i = 0; i < ndevices; i++) {
   289			ret = of_parse_phandle_with_args(soc_pm.shdwc_np,
   290							 "microchip,lpm-connection",
   291							 NULL, i, &lpmspec);
   292			if (ret < 0) {
   293				if (ret == -ENOENT) {
   294					continue;
   295				} else {
   296					soc_pm.data.lpm = 0;
   297					return ret;
   298				}
   299			}
   300	
   301			pdev = of_find_device_by_node(lpmspec.np);
   302			if (!pdev)
   303				continue;
   304	
   305			if (device_may_wakeup(&pdev->dev)) {
   306				if (pm_mode == AT91_PM_ULP1) {
   307					/*
   308					 * ULP1 wake-up sources are limited. Ignore it if not
   309					 * in soc_pm.ws_ids.
   310					 */
   311					if (at91_pm_device_in_list(pdev, soc_pm.ws_ids))
   312						soc_pm.data.lpm = 0;
   313				} else {
   314					soc_pm.data.lpm = 0;
   315				}
   316			}
   317	
   318			put_device(&pdev->dev);
   319			if (!soc_pm.data.lpm)
   320				break;
   321		}
   322	
   323		return 0;
   324	}
   325	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Hi, Ryan,

On 9/10/25 19:20, Ryan.Wanner@microchip.com wrote:
> From: Claudiu Beznea <claudiu.beznea@tuxon.dev>

Actually, this was developed while I was with Microchip. I think this still
belongs to Microchip, so I would use the old email address.

> 
> The LPM shutdown controller output could signal the transition to PM
> state for different devices connected on board. On different boards
> LPM could be connected to different devices (e.g. on SAMA7G5-EK REV4
> the LPM is connected to on main crystal oscillator, KSZ8081 PHY and
> to MCP16502 PMIC). Toggling LPM on BSR PM mode is done unconditionally
> and it helps PMIC to transition to a power saving mode. Toggling LPM
> on ULP0 and ULP1 should be done conditionally based on user defined
> wakeup sources, available wakeup source for PM mode and connections to
> SHDWC's LPM pin. On ULP0 any device could act as wakeup sources. On ULP1
> only some of the on SoC controllers could act as wakeup sources. For this
> the architecture specific PM code parses board specific LPM devices,
> check them against possible wakeup source (in case of ULP1) and tells
> assembly code to act properly on SHDWC's LPM pin.
> 
> Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
> [ryan.wanner@microchip.com: Fixed conflicts when applying.]
> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
> ---
>   arch/arm/mach-at91/pm.c              | 98 +++++++++++++++++++++++++++-
>   arch/arm/mach-at91/pm.h              |  1 +
>   arch/arm/mach-at91/pm_data-offsets.c |  1 +
>   arch/arm/mach-at91/pm_suspend.S      | 50 ++++++++++++--
>   4 files changed, 141 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 35058b99069c..29348d6c852b 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -116,6 +116,7 @@ struct at91_pm_quirks {
>    * @config_shdwc_ws: wakeup sources configuration function for SHDWC
>    * @config_pmc_ws: wakeup srouces configuration function for PMC
>    * @ws_ids: wakup sources of_device_id array
> + * @shdwc_np: pointer to shdwc node
>    * @bu: backup unit mapped data (for backup mode)
>    * @quirks: PM quirks
>    * @data: PM data to be used on last phase of suspend
> @@ -126,6 +127,7 @@ struct at91_soc_pm {
>   	int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity);
>   	int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity);
>   	const struct of_device_id *ws_ids;
> +	struct device_node *shdwc_np;
>   	struct at91_pm_bu *bu;
>   	struct at91_pm_quirks quirks;
>   	struct at91_pm_data data;
> @@ -243,6 +245,84 @@ static const struct of_device_id sam9x7_ws_ids[] = {
>   	{ /* sentinel */ }
>   };
>   
> +static int at91_pm_device_in_list(const struct platform_device *pdev,
> +				  const struct of_device_id *ids)

I think would be better to make it return bool

> +{
> +	struct platform_device *local_pdev;
> +	const struct of_device_id *match;
> +	struct device_node *np;
> +	int in_list = 0;
> +
> +	for_each_matching_node_and_match(np, ids, &match) {
> +		local_pdev = of_find_device_by_node(np);
> +		if (!local_pdev)
> +			continue;
> +
> +		if (pdev == local_pdev)
> +			in_list = 1;
> +
> +		put_device(&local_pdev->dev);
> +		if (in_list)
> +			return in_list;
> +	}

And simplify this a bit as:

static bool at91_pm_device_in_list(const struct platform_device *pdev,
				  const struct of_device_id *ids)
{
	struct platform_device *local_pdev;
	const struct of_device_id *match;
	struct device_node *np;

	for_each_matching_node_and_match(np, ids, &match) {
		local_pdev = of_find_device_by_node(np);
		if (!local_pdev)
			continue;

		put_device(&local_pdev->dev);
		if (pdev == local_pdev)
			return true;
	}

	return false;
}


> +
> +	return in_list;
> +}
> +
> +static int at91_pm_prepare_lpm(unsigned int pm_mode)
> +{
> +	struct platform_device *pdev;
> +	int ndevices, i, ret;
> +	struct of_phandle_args lpmspec;
> +
> +	if ((pm_mode != AT91_PM_ULP0 && pm_mode != AT91_PM_ULP1) ||
> +	    !soc_pm.shdwc_np)
> +		return 0;
> +
> +	ndevices = of_count_phandle_with_args(soc_pm.shdwc_np,
> +					      "microchip,lpm-connection", 0);
> +	if (ndevices < 0)
> +		return 0;
> +
> +	soc_pm.data.lpm = 1;
> +	for (i = 0; i < ndevices; i++) {
> +		ret = of_parse_phandle_with_args(soc_pm.shdwc_np,
> +						 "microchip,lpm-connection",
> +						 NULL, i, &lpmspec);
> +		if (ret < 0) {
> +			if (ret == -ENOENT) {
> +				continue;
> +			} else {
> +				soc_pm.data.lpm = 0;
> +				return ret;
> +			}
> +		}
> +
> +		pdev = of_find_device_by_node(lpmspec.np);

From the documentation of of_parse_phandle_with_args() this code would have
to call of_node_put(lpmspec.np);

Here would be the place to do it.

> +		if (!pdev)
> +			continue;
> +
> +		if (device_may_wakeup(&pdev->dev)) {
> +			if (pm_mode == AT91_PM_ULP1) {
> +				/*
> +				 * ULP1 wake-up sources are limited. Ignore it if not
> +				 * in soc_pm.ws_ids.
> +				 */
> +				if (at91_pm_device_in_list(pdev, soc_pm.ws_ids))
> +					soc_pm.data.lpm = 0;
> +			} else {
> +				soc_pm.data.lpm = 0;
> +			}
> +		}
> +
> +		put_device(&pdev->dev);
> +		if (!soc_pm.data.lpm)
> +			break;
> +	}
> +
> +	return 0;
> +}
> +
>   static int at91_pm_config_ws(unsigned int pm_mode, bool set)
>   {
>   	const struct wakeup_source_info *wsi;
> @@ -481,10 +561,17 @@ static int at91_pm_begin(suspend_state_t state)
>   		soc_pm.data.mode = -1;
>   	}
>   
> -	ret = at91_pm_config_ws(soc_pm.data.mode, true);
> +	ret = at91_pm_prepare_lpm(soc_pm.data.mode);
>   	if (ret)
>   		return ret;
>   
> +	ret = at91_pm_config_ws(soc_pm.data.mode, true);
> +	if (ret) {
> +		/* Revert LPM if any. */
> +		soc_pm.data.lpm = 0;
> +		return ret;
> +	}
> +
>   	if (soc_pm.data.mode == AT91_PM_BACKUP)
>   		soc_pm.bu->suspended = 1;
>   	else if (soc_pm.bu)
> @@ -1266,7 +1353,11 @@ static void __init at91_pm_modes_init(const u32 *maps, int len)
>   			AT91_PM_REPLACE_MODES(maps, SHDWC);
>   		} else {
>   			soc_pm.data.shdwc = of_iomap(np, 0);
> -			of_node_put(np);
> +			/*
> +			 * np is used further on suspend/resume path so we skip the
> +			 * of_node_put(np) here.
> +			 */
> +			soc_pm.shdwc_np = np;
>   		}
>   	}
>   
> @@ -1669,7 +1760,8 @@ void __init sama7_pm_init(void)
>   		AT91_PM_STANDBY, AT91_PM_ULP0, AT91_PM_ULP1, AT91_PM_BACKUP,
>   	};
>   	static const u32 iomaps[] __initconst = {
> -		[AT91_PM_ULP0]		= AT91_PM_IOMAP(SFRBU),
> +		[AT91_PM_ULP0]		= AT91_PM_IOMAP(SFRBU) |
> +					  AT91_PM_IOMAP(SHDWC),
>   		[AT91_PM_ULP1]		= AT91_PM_IOMAP(SFRBU) |
>   					  AT91_PM_IOMAP(SHDWC) |
>   					  AT91_PM_IOMAP(ETHC),
> diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
> index 50c3a425d140..5707ff6ff444 100644
> --- a/arch/arm/mach-at91/pm.h
> +++ b/arch/arm/mach-at91/pm.h
> @@ -40,6 +40,7 @@ struct at91_pm_data {
>   	unsigned int pmc_mckr_offset;
>   	unsigned int pmc_version;
>   	unsigned int pmc_mcks;
> +	unsigned int lpm;
>   };
>   #endif
>   
> diff --git a/arch/arm/mach-at91/pm_data-offsets.c b/arch/arm/mach-at91/pm_data-offsets.c
> index 0ca5da66dc26..fb9651abdfdf 100644
> --- a/arch/arm/mach-at91/pm_data-offsets.c
> +++ b/arch/arm/mach-at91/pm_data-offsets.c
> @@ -20,6 +20,7 @@ int main(void)
>   						 pmc_version));
>   	DEFINE(PM_DATA_PMC_MCKS,	offsetof(struct at91_pm_data,
>   						 pmc_mcks));
> +	DEFINE(PM_DATA_LPM,		offsetof(struct at91_pm_data, lpm));
>   
>   	return 0;
>   }
> diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
> index aad53ec9e957..198236bdbbb3 100644
> --- a/arch/arm/mach-at91/pm_suspend.S
> +++ b/arch/arm/mach-at91/pm_suspend.S
> @@ -110,9 +110,30 @@ lp_done_\ena:
>   #endif
>   	.endm
>   
> -	.macro at91_backup_set_lpm reg
> +/*
> + * Set LPM
> + * @ena: 0 - disable LPM
> + *	 1 - enable LPM
> + *
> + * Side effects: overwrites r7, r8, r9
> + */
> +	.macro at91_set_lpm ena
>   #ifdef CONFIG_SOC_SAMA7
> -	orr	\reg, \reg, #0x200000
> +	ldr	r7, .lpm
> +	cmp	r7, #1
> +	bne	21f
> +	ldr	r7, .shdwc
> +	cmp	r7, #0
> +	beq	21f
> +	mov	r8, #0xA5000000
> +	add	r8, #0x200000
> +	mov	r9, #\ena
> +	cmp	r9, #1
> +	beq	20f
> +	add	r8, #0x200000
> +20:
> +	str	r8, [r7]
> +21:
>   #endif
>   	.endm
>   
> @@ -502,7 +523,7 @@ sr_dis_exit:
>   	ldr	tmp1, [pmc, #AT91_PMC_SR]
>   	str	tmp1, .saved_osc_status
>   	tst	tmp1, #AT91_PMC_MOSCRCS
> -	bne	1f
> +	bne	7f
>   
>   	/* Turn off RC oscillator */
>   	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
> @@ -516,6 +537,9 @@ sr_dis_exit:
>   	tst	tmp1, #AT91_PMC_MOSCRCS
>   	bne	2b
>   
> +	/* Enable LPM. */
> +7:	at91_set_lpm 1
> +
>   	/* Wait for interrupt */
>   1:	at91_cpu_idle
>   
> @@ -533,8 +557,10 @@ sr_dis_exit:
>   	wait_mckrdy tmp3
>   	b	6f
>   
> -5:	/* Restore RC oscillator state */
> -	ldr	tmp1, .saved_osc_status
> +5:	at91_set_lpm 0
> +
> +	/* Restore RC oscillator state */
> +8:	ldr	tmp1, .saved_osc_status

"8:" in front of the line could be dropped

Thank you,
Claudiu

>   	tst	tmp1, #AT91_PMC_MOSCRCS
>   	beq	4f
>   
> @@ -611,6 +637,9 @@ sr_dis_exit:
>   
>   	wait_mckrdy tmp3
>   
> +	/* Enable LPM */
> +	at91_set_lpm 1
> +
>   	/* Enter the ULP1 mode by set WAITMODE bit in CKGR_MOR */
>   	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
>   	orr	tmp1, tmp1, #AT91_PMC_WAITMODE
> @@ -624,6 +653,9 @@ sr_dis_exit:
>   
>   	wait_mckrdy tmp3
>   
> +	/* Disable LPM. */
> +	at91_set_lpm 0
> +
>   	/* Enable the crystal oscillator */
>   	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
>   	orr	tmp1, tmp1, #AT91_PMC_MOSCEN
> @@ -1083,7 +1115,9 @@ ulp_exit:
>   	ldr	r0, .shdwc
>   	mov	tmp1, #0xA5000000
>   	add	tmp1, tmp1, #0x1
> -	at91_backup_set_lpm tmp1
> +#ifdef CONFIG_SOC_SAMA7
> +	orr	tmp1, tmp1, #0x200000
> +#endif
>   	str	tmp1, [r0, #0]
>   .endm
>   
> @@ -1117,6 +1151,8 @@ ENTRY(at91_pm_suspend_in_sram)
>   #ifdef CONFIG_SOC_SAMA7
>   	ldr	tmp1, [r0, #PM_DATA_PMC_MCKS]
>   	str	tmp1, .mcks
> +	ldr	tmp1, [r0, #PM_DATA_LPM]
> +	str	tmp1, .lpm
>   #endif
>   
>   	/*
> @@ -1208,6 +1244,8 @@ ENDPROC(at91_pm_suspend_in_sram)
>   #ifdef CONFIG_SOC_SAMA7
>   .mcks:
>   	.word 0
> +.lpm:
> +	.word 0
>   #endif
>   .saved_mckr:
>   	.word 0