[PATCH 0/2] pm fixes for SAM9X60

[PATCH 0/2] pm fixes for SAM9X60

[Claudiu Beznea]

Shutdown controller and PMC changes for SAM9X60 were not integrated
when PM patches for SAM9X60 were submitted.

Thank you,
Claudiu Beznea

Claudiu Beznea (2):
  ARM: at91: pm: use SAM9X60 PMC's compatible
  ARM: at91: pm: use of_device_id array to find the proper shdwc node

 arch/arm/mach-at91/pm.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/2] ARM: at91: pm: use SAM9X60 PMC's compatible

[Claudiu Beznea]

SAM9X60 PMC's has a different PMC. It was not integrated at the moment
commit 01c7031cfa73 ("ARM: at91: pm: initial PM support for SAM9X60")
was published.

Fixes: 01c7031cfa73 ("ARM: at91: pm: initial PM support for SAM9X60")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/mach-at91/pm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 1c88b47c236f..457301709e54 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -755,6 +755,7 @@ static const struct of_device_id atmel_pmc_ids[] __initconst = {
 	{ .compatible = "atmel,sama5d3-pmc", .data = &pmc_infos[1] },
 	{ .compatible = "atmel,sama5d4-pmc", .data = &pmc_infos[1] },
 	{ .compatible = "atmel,sama5d2-pmc", .data = &pmc_infos[1] },
+	{ .compatible = "microchip,sam9x60-pmc", .data = &pmc_infos[1] },
 	{ /* sentinel */ },
 };
 
-- 
2.7.4

[PATCH 2/2] ARM: at91: pm: use of_device_id array to find the proper shdwc node

[Claudiu Beznea]

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>
---
 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 457301709e54..ce907672438b 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -695,6 +695,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;
@@ -704,7 +710,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.7.4

Re: [PATCH 1/2] ARM: at91: pm: use SAM9X60 PMC's compatible

[Alexandre Belloni]

On 11/12/2019 13:04:07+0200, Claudiu Beznea wrote:
> SAM9X60 PMC's has a different PMC. It was not integrated at the moment
> commit 01c7031cfa73 ("ARM: at91: pm: initial PM support for SAM9X60")
> was published.
> 
> Fixes: 01c7031cfa73 ("ARM: at91: pm: initial PM support for SAM9X60")
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
>  arch/arm/mach-at91/pm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
Applied, thanks.

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 2/2] ARM: at91: pm: use of_device_id array to find the proper shdwc node

[Alexandre Belloni]

On 11/12/2019 13:04:08+0200, Claudiu Beznea wrote:
> 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>
> ---
>  arch/arm/mach-at91/pm.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com