AT91 SoC for 5.9

- Two small fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAl8d1foACgkQ2wIijOdR
 NOV/Sw//dinmYu94FAZmrfJLPcnmIk5Dt7QMFLc2nbjJ17A3blvHezkQMYCGUdAq
 xWH9iLrSp1ytXsCBe+flCqI907rYshruxD+9z2amv9oqY2VG5VSRtBgTcD2s5cR9
 Zf1sAGnWjKiWM8gbOAHZ27tJICSUcb1Vr8+WRMCxfh98ZussGLKMAVGZh5PgmPAd
 ntloTqN203jF/MCube7m86GZSNSleANx1ZnV+rvx3MALLJkHgG8V27eNgkXcqksf
 08tYXkFxftMlOEB27zHDIfBE6w6FSfNowFcvG49CC8q0XRXE2Vky/0mCJgA7WctV
 nwETKqpZ3yu0tvVMCetJlbstEvdDujZwyvqYJzzFzjTRzMme240GvKW/A4JXS2NM
 b2unq20q3w2Sb8PNuRbZCoc8sFRKNCGFCYCJaAXJhAVa+pMQxDluFNm9wUahm8ly
 Rt6lK1Rc6XnxcE5mB/EEcwj+ef41eU7eiFI4i6dxGb+WoA4mI+XHpEXJ0DYUnfL9
 SEJov9zcVEU8E+QumU4ShECnjba/lY5ppnM1aIL2BGpyLube2JoajuKrS3cwYgV+
 n3gB0d9dkHrsxwRcBrPMYDMHMrlIgkb6QHZvVCZl4+ZKJ9Vjh5TChFPCW6bB0/Vu
 TJvzJzkpQz2g0zfY+bNudjkKmwfmO5iliYAlfExNj+Sf3ox5VDU=
 =swWJ
 -----END PGP SIGNATURE-----

Merge tag 'at91-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc

AT91 SoC for 5.9

 - Two small fixes

* tag 'at91-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: Replace HTTP links with HTTPS ones
  ARM: at91: pm: add missing put_device() call in at91_pm_sram_init()

Link: https://lore.kernel.org/r/20200726193335.GA182444@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-07-27 17:26:55 +02:00
commit 552c0e308b
2 changed files with 9 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
# Patch waits for application at
# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
# https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .

View File

@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void)
sram_pool = gen_pool_get(&pdev->dev, NULL);
if (!sram_pool) {
pr_warn("%s: sram pool unavailable!\n", __func__);
return;
goto out_put_device;
}
sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);
if (!sram_base) {
pr_warn("%s: unable to alloc sram!\n", __func__);
return;
goto out_put_device;
}
sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void)
at91_pm_suspend_in_sram_sz, false);
if (!at91_suspend_sram_fn) {
pr_warn("SRAM: Could not map\n");
return;
goto out_put_device;
}
/* Copy the pm suspend handler to SRAM */
at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,
&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
return;
out_put_device:
put_device(&pdev->dev);
return;
}
static bool __init at91_is_pm_mode_active(int pm_mode)