aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.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/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.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/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch')
-rw-r--r--target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch b/target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch
index 41c796b693..cc5f4aec0a 100644
--- a/target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch
+++ b/target/linux/at91/patches-5.10/215-ARM-at91-pm-add-backup-mode-support-for-SAMA7G5.patch
@@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20210415105010.569620-21-claudiu.beznea@microchi
arch/arm/mach-at91/pm_suspend.S | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
-diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
-index fd3beaeec17d..653350eec9b6 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
-@@ -744,7 +744,8 @@ static int __init at91_pm_backup_init(void)
+@@ -744,7 +744,8 @@ static int __init at91_pm_backup_init(vo
struct platform_device *pdev;
int ret = -ENODEV, located = 0;
@@ -29,8 +27,6 @@ index fd3beaeec17d..653350eec9b6 100644
return -EPERM;
if (!at91_is_pm_mode_active(AT91_PM_BACKUP))
-diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
-index 7396e18dd7e5..cbd61a3bcab1 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -106,6 +106,12 @@ lp_done_\ena:
@@ -54,6 +50,3 @@ index 7396e18dd7e5..cbd61a3bcab1 100644
str tmp1, [r0, #0]
.endm
---
-2.32.0
-