aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-03-02 13:11:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-05 21:05:45 +0100
commit05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch)
tree68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch
parentef4bf8b403205062ddb38ebe7b8c4951be346368 (diff)
downloadupstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz
upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2
upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip
kernel: bump 5.10 to 5.10.103
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch')
-rw-r--r--target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch b/target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch
index f6306c8276..a46b5acb22 100644
--- a/target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch
+++ b/target/linux/at91/patches-5.10/214-ARM-at91-pm-save-ddr-phy-calibration-data-to-securam.patch
@@ -21,8 +21,6 @@ Link: https://lore.kernel.org/r/20210415105010.569620-20-claudiu.beznea@microchi
arch/arm/mach-at91/pm.c | 60 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 59 insertions(+), 1 deletion(-)
-diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
-index b047a1f2ddfb..fd3beaeec17d 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -10,6 +10,7 @@
@@ -93,7 +91,7 @@ index b047a1f2ddfb..fd3beaeec17d 100644
flush_cache_all();
outer_disable();
-@@ -688,12 +709,40 @@ static bool __init at91_is_pm_mode_active(int pm_mode)
+@@ -688,12 +709,40 @@ static bool __init at91_is_pm_mode_activ
soc_pm.data.suspend_mode == pm_mode);
}
@@ -135,7 +133,7 @@ index b047a1f2ddfb..fd3beaeec17d 100644
if (!IS_ENABLED(CONFIG_SOC_SAMA5D2))
return -EPERM;
-@@ -728,6 +777,15 @@ static int __init at91_pm_backup_init(void)
+@@ -728,6 +777,15 @@ static int __init at91_pm_backup_init(vo
soc_pm.bu->suspended = 0;
soc_pm.bu->canary = __pa_symbol(&canary);
soc_pm.bu->resume = __pa_symbol(cpu_resume);
@@ -151,6 +149,3 @@ index b047a1f2ddfb..fd3beaeec17d 100644
return 0;
---
-2.32.0
-