target/linux/at91/patches-5.10/230-ARM-at91-pm-group-constants-and-addresses-loading.patch

   1 From 12330a9f6b99622e3c21ddcc720b02431b8a6e2d Mon Sep 17 00:00:00 2001
   2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
   3 Date: Thu, 30 Sep 2021 18:42:18 +0300
   4 Subject: [PATCH 230/247] ARM: at91: pm: group constants and addresses loading
   5
   6 Group constants and addresses loading. This commit prepares the field for
   7 the next one.
   8
   9 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
  10 Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
  11 Link: https://lore.kernel.org/r/20210930154219.2214051-3-claudiu.beznea@microchip.com
  12 ---
  13  arch/arm/mach-at91/pm_suspend.S | 17 +++++++++--------
  14  1 file changed, 9 insertions(+), 8 deletions(-)
  15
  16 diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
  17 index cbd61a3bcab1..34f251fdb743 100644
  18 --- a/arch/arm/mach-at91/pm_suspend.S
  19 +++ b/arch/arm/mach-at91/pm_suspend.S
  20 @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram)
  21         mov     tmp1, #0
  22         mcr     p15, 0, tmp1, c7, c10, 4
  23
  24 +       ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
  25 +       str     tmp1, .mckr_offset
  26 +       ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
  27 +       str     tmp1, .pmc_version
  28 +       ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
  29 +       str     tmp1, .memtype
  30 +       ldr     tmp1, [r0, #PM_DATA_MODE]
  31 +       str     tmp1, .pm_mode
  32 +
  33         ldr     tmp1, [r0, #PM_DATA_PMC]
  34         str     tmp1, .pmc_base
  35         ldr     tmp1, [r0, #PM_DATA_RAMC0]
  36 @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram)
  37         str     tmp1, .sramc1_base
  38         ldr     tmp1, [r0, #PM_DATA_RAMC_PHY]
  39         str     tmp1, .sramc_phy_base
  40 -       ldr     tmp1, [r0, #PM_DATA_MEMCTRL]
  41 -       str     tmp1, .memtype
  42 -       ldr     tmp1, [r0, #PM_DATA_MODE]
  43 -       str     tmp1, .pm_mode
  44 -       ldr     tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET]
  45 -       str     tmp1, .mckr_offset
  46 -       ldr     tmp1, [r0, #PM_DATA_PMC_VERSION]
  47 -       str     tmp1, .pmc_version
  48         /* Both ldrne below are here to preload their address in the TLB */
  49         ldr     tmp1, [r0, #PM_DATA_SHDWC]
  50         str     tmp1, .shdwc
  51 --
  52 2.32.0
  53