ARM: at91: pm: use of_device_id array to find the proper shdwc node

commit ec6e618c8c018c1361d77789a100a5f6f6317178 upstream.

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

Fixes: eaedc0d379da ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 03250768340e48cad2bd6a82c3b8998879655207..52665f30d236df58337112f23a6997d49da433bd 100644 (file)
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -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;