lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 323/542] ARM: at91: pm: use of_device_id array to find the proper shdwc node
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit ec6e618c8c018c1361d77789a100a5f6f6317178 ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-at91/pm.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
    index 03250768340e4..52665f30d236d 100644
    --- 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;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:11    [W:2.086 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site