230-ARM-at91-pm-group-constants-and-addresses-loading.patch 1.6 KB

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