[PATCH v2 0/3] ARM: at91: pm: fix wakeup from RTC for ULP1

[PATCH v2 0/3] ARM: at91: pm: fix wakeup from RTC for ULP1

[Claudiu Beznea]

Hi,

Series fixes the wakeup from RTC alarm for ULP1 on SAM9X60 and SAMA7G5.
I kept them as 3 patches to be able to be backported to proper kernels.

Thank you,
Claudiu Beznea

Changes in v2:
- added patch with title
  "ARM: at91: pm: use proper compatibles for sama5d2's rtc"

Claudiu Beznea (3):
  ARM: at91: pm: use proper compatibles for sama5d2's rtc
  ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt
  ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt

 arch/arm/mach-at91/pm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-- 
2.34.1

[PATCH v2 1/3] ARM: at91: pm: use proper compatibles for sama5d2's rtc

[Claudiu Beznea]

Use proper compatible strings for SAMA5D2's RTC IPs. These is necessary
for configuring wakeup sources for ULP1 PM mode.

Fixes: d7484f5c6b3b ("ARM: at91: pm: configure wakeup sources for ULP1 mode")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/mach-at91/pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index b1a43d7bc56c..4d62f686bd1e 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -202,7 +202,7 @@ static const struct wakeup_source_info ws_info[] = {
 
 static const struct of_device_id sama5d2_ws_ids[] = {
 	{ .compatible = "atmel,sama5d2-gem",		.data = &ws_info[0] },
-	{ .compatible = "atmel,at91rm9200-rtc",		.data = &ws_info[1] },
+	{ .compatible = "atmel,sama5d2-rtc",		.data = &ws_info[1] },
 	{ .compatible = "atmel,sama5d3-udc",		.data = &ws_info[2] },
 	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },
 	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
-- 
2.34.1

[PATCH v2 2/3] ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt

[Claudiu Beznea]

Use proper compatible strings for SAM9X60's RTC and RTT IPs. These are
necessary for configuring wakeup sources for ULP1 PM mode.

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 4d62f686bd1e..f017b2d1b11e 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -213,12 +213,12 @@ static const struct of_device_id sama5d2_ws_ids[] = {
 };
 
 static const struct of_device_id sam9x60_ws_ids[] = {
-	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },
+	{ .compatible = "microchip,sam9x60-rtc",	.data = &ws_info[1] },
 	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },
 	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
 	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },
 	{ .compatible = "usb-ehci",			.data = &ws_info[2] },
-	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },
+	{ .compatible = "microchip,sam9x60-rtt",	.data = &ws_info[4] },
 	{ .compatible = "cdns,sam9x60-macb",		.data = &ws_info[5] },
 	{ /* sentinel */ }
 };
-- 
2.34.1

[PATCH v2 3/3] ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt

[Claudiu Beznea]

Use proper compatible strings for SAMA7G5's RTC and RTT IPs. These are
necessary for configuring wakeup sources for ULP1 PM mode.

Fixes: 6501330f9f5e ("ARM: at91: pm: add pm support for SAMA7G5")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/mach-at91/pm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index f017b2d1b11e..826fd56d2a17 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -224,13 +224,13 @@ static const struct of_device_id sam9x60_ws_ids[] = {
 };
 
 static const struct of_device_id sama7g5_ws_ids[] = {
-	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },
+	{ .compatible = "microchip,sama7g5-rtc",	.data = &ws_info[1] },
 	{ .compatible = "microchip,sama7g5-ohci",	.data = &ws_info[2] },
 	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
 	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },
 	{ .compatible = "usb-ehci",			.data = &ws_info[2] },
 	{ .compatible = "microchip,sama7g5-sdhci",	.data = &ws_info[3] },
-	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },
+	{ .compatible = "microchip,sama7g5-rtt",	.data = &ws_info[4] },
 	{ /* sentinel */ }
 };
 
-- 
2.34.1

Re: [PATCH v2 0/3] ARM: at91: pm: fix wakeup from RTC for ULP1

[Claudiu.Beznea]

On 23.05.2022 12:24, Claudiu Beznea wrote:
> Hi,
> 
> Series fixes the wakeup from RTC alarm for ULP1 on SAM9X60 and SAMA7G5.
> I kept them as 3 patches to be able to be backported to proper kernels.
> 
> Thank you,
> Claudiu Beznea
> 
> Changes in v2:
> - added patch with title
>   "ARM: at91: pm: use proper compatibles for sama5d2's rtc"
> 
> Claudiu Beznea (3):
>   ARM: at91: pm: use proper compatibles for sama5d2's rtc
>   ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt
>   ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt
> 
>  arch/arm/mach-at91/pm.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 

Applied to at91-fixes, thanks!