target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch

   1 From 673d2519e9028dafb678fac29a990740958bed3c Mon Sep 17 00:00:00 2001
   2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
   3 Date: Thu, 15 Apr 2021 13:49:54 +0300
   4 Subject: [PATCH 204/247] ARM: at91: pm:
   5  s/CONFIG_SOC_SAM9X60/CONFIG_HAVE_AT91_SAM9X60_PLL/g
   6
   7 Replace CONFIG_SOC_SAM9X60 with CONFIG_HAVE_AT91_SAM9X60_PLL as the
   8 SAM9X60's PLL is also present on SAMA7G5.
   9
  10 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
  11 Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
  12 Link: https://lore.kernel.org/r/20210415105010.569620-9-claudiu.beznea@microchip.com
  13 ---
  14  arch/arm/mach-at91/pm_suspend.S | 4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
  18 index 960ad29cce51..1f63bbfad728 100644
  19 --- a/arch/arm/mach-at91/pm_suspend.S
  20 +++ b/arch/arm/mach-at91/pm_suspend.S
  21 @@ -422,7 +422,7 @@ sr_dis_exit:
  22         cmp     tmp1, #AT91_PMC_V1
  23         beq     1f
  24
  25 -#ifdef CONFIG_SOC_SAM9X60
  26 +#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL
  27         /* Save PLLA settings. */
  28         ldr     tmp2, [pmc, #AT91_PMC_PLL_UPDT]
  29         bic     tmp2, tmp2, #AT91_PMC_PLL_UPDT_ID
  30 @@ -489,7 +489,7 @@ sr_dis_exit:
  31         cmp     tmp3, #AT91_PMC_V1
  32         beq     4f
  33
  34 -#ifdef CONFIG_SOC_SAM9X60
  35 +#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL
  36         /* step 1. */
  37         ldr     tmp1, [pmc, #AT91_PMC_PLL_UPDT]
  38         bic     tmp1, tmp1, #AT91_PMC_PLL_UPDT_ID
  39 --
  40 2.32.0
  41