aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch')
-rw-r--r--target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch b/target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch
deleted file mode 100644
index 4601d922d6..0000000000
--- a/target/linux/at91/patches-5.10/204-ARM-at91-pm-s-CONFIG_SOC_SAM9X60-CONFIG_HAVE_AT91_SA.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 673d2519e9028dafb678fac29a990740958bed3c Mon Sep 17 00:00:00 2001
-From: Claudiu Beznea <claudiu.beznea@microchip.com>
-Date: Thu, 15 Apr 2021 13:49:54 +0300
-Subject: [PATCH 204/247] ARM: at91: pm:
- s/CONFIG_SOC_SAM9X60/CONFIG_HAVE_AT91_SAM9X60_PLL/g
-
-Replace CONFIG_SOC_SAM9X60 with CONFIG_HAVE_AT91_SAM9X60_PLL as the
-SAM9X60's PLL is also present on SAMA7G5.
-
-Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
-Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-Link: https://lore.kernel.org/r/20210415105010.569620-9-claudiu.beznea@microchip.com
----
- arch/arm/mach-at91/pm_suspend.S | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/mach-at91/pm_suspend.S
-+++ b/arch/arm/mach-at91/pm_suspend.S
-@@ -422,7 +422,7 @@ sr_dis_exit:
- cmp tmp1, #AT91_PMC_V1
- beq 1f
-
--#ifdef CONFIG_SOC_SAM9X60
-+#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL
- /* Save PLLA settings. */
- ldr tmp2, [pmc, #AT91_PMC_PLL_UPDT]
- bic tmp2, tmp2, #AT91_PMC_PLL_UPDT_ID
-@@ -489,7 +489,7 @@ sr_dis_exit:
- cmp tmp3, #AT91_PMC_V1
- beq 4f
-
--#ifdef CONFIG_SOC_SAM9X60
-+#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL
- /* step 1. */
- ldr tmp1, [pmc, #AT91_PMC_PLL_UPDT]
- bic tmp1, tmp1, #AT91_PMC_PLL_UPDT_ID