Merge tag 'at91-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc (552c0e30) · Commits · 戴 / test

arch/arm/mach-at91/Makefile.boot

+1 −1

Original line number	Diff line number	Diff line
		# 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 .

+8 −3

Original line number	Diff line number	Diff line
		@@ -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)