ARM: at91: pm: use of_device_id array to find the proper shdwc node (ec6e618c) · Commits · 戴 / test

Use of_device_id array to find the proper shdwc compatibile node. SAM9X60's shdwc changes were not integrated when commit ("ARM: at91: pm: add ULP1 support for SAM9X60") was integrated. Fixes: ("ARM: at91: pm: add ULP1 support for SAM9X60") Signed-off-by:

Claudiu Beznea <claudiu.beznea@microchip.com> Link: https://lore.kernel.org/r/1576062248-18514-3-git-send-email-claudiu.beznea@microchip.com Signed-off-by:

Alexandre Belloni <alexandre.belloni@bootlin.com>

arch/arm/mach-at91/pm.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -691,6 +691,12 @@ static void __init at91_pm_use_default_mode(int pm_mode)
		soc_pm.data.suspend_mode = AT91_PM_ULP0;
		}

		static const struct of_device_id atmel_shdwc_ids[] = {
		{ .compatible = "atmel,sama5d2-shdwc" },
		{ .compatible = "microchip,sam9x60-shdwc" },
		{ /* sentinel. */ }
		};

		static void __init at91_pm_modes_init(void)
		{
		struct device_node *np;
		@@ -700,7 +706,7 @@ static void __init at91_pm_modes_init(void)
		!at91_is_pm_mode_active(AT91_PM_ULP1))
		return;

		np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-shdwc");
		np = of_find_matching_node(NULL, atmel_shdwc_ids);
		if (!np) {
		pr_warn("%s: failed to find shdwc!\n", __func__);
		goto ulp1_default;

Admin message