diff mbox series

[v2,3/3] power: reset: at91-reset: add support for sam9x60 SoC

Message ID 20190206181221.27914-3-nicolas.ferre@microchip.com (mailing list archive)
State Not Applicable, archived
Headers show
Series [v2,1/3] dt-bindings: arm: atmel: add missing samx7 to reset controller | expand

Commit Message

Nicolas Ferre Feb. 6, 2019, 6:12 p.m. UTC 
Add support for additional reset causes and the proper compatibility
string for sam9x60 SoC. The restart function is the same as the samx7.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
v2: split series and collect tag

Sebastian,
I add your Acked-by tag here but as I would like that you take the 3 patches on
your tree now, I let you modify it on your side. I'm expecting Alexandre or
Ludovic to have a look as well.

Best regards,
  Nicolas

 drivers/power/reset/at91-reset.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Alexandre Belloni Feb. 8, 2019, 3:24 p.m. UTC | #1 
On 06/02/2019 19:12:21+0100, Nicolas Ferre wrote:
> Add support for additional reset causes and the proper compatibility
> string for sam9x60 SoC. The restart function is the same as the samx7.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
> v2: split series and collect tag
> 
> Sebastian,
> I add your Acked-by tag here but as I would like that you take the 3 patches on
> your tree now, I let you modify it on your side. I'm expecting Alexandre or
> Ludovic to have a look as well.
> 

Sebastian, please take this series through your tree. Thanks!
Sebastian Reichel Feb. 19, 2019, 11:43 p.m. UTC | #2 
Hi,

On Fri, Feb 08, 2019 at 04:24:35PM +0100, Alexandre Belloni wrote:
> On 06/02/2019 19:12:21+0100, Nicolas Ferre wrote:
> > Add support for additional reset causes and the proper compatibility
> > string for sam9x60 SoC. The restart function is the same as the samx7.
> > 
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> > Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> 
> > ---
> > v2: split series and collect tag
> > 
> > Sebastian,
> > I add your Acked-by tag here but as I would like that you take the 3 patches on
> > your tree now, I let you modify it on your side. I'm expecting Alexandre or
> > Ludovic to have a look as well.
> > 
> 
> Sebastian, please take this series through your tree. Thanks!

All right. I just merged them!

-- Sebastian
diff mbox series

Patch

diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index f44a9ffcc2ab..44ca983a49a1 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -44,6 +44,9 @@  enum reset_type {
 	RESET_TYPE_WATCHDOG	= 2,
 	RESET_TYPE_SOFTWARE	= 3,
 	RESET_TYPE_USER		= 4,
+	RESET_TYPE_CPU_FAIL	= 6,
+	RESET_TYPE_XTAL_FAIL	= 7,
+	RESET_TYPE_ULP2		= 8,
 };
 
 static void __iomem *at91_ramc_base[2], *at91_rstc_base;
@@ -164,6 +167,15 @@  static void __init at91_reset_status(struct platform_device *pdev)
 	case RESET_TYPE_USER:
 		reason = "user reset";
 		break;
+	case RESET_TYPE_CPU_FAIL:
+		reason = "CPU clock failure detection";
+		break;
+	case RESET_TYPE_XTAL_FAIL:
+		reason = "32.768 kHz crystal failure detection";
+		break;
+	case RESET_TYPE_ULP2:
+		reason = "ULP2 reset";
+		break;
 	default:
 		reason = "unknown reset";
 		break;
@@ -183,6 +195,7 @@  static const struct of_device_id at91_reset_of_match[] = {
 	{ .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
 	{ .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart },
 	{ .compatible = "atmel,samx7-rstc", .data = samx7_restart },
+	{ .compatible = "microchip,sam9x60-rstc", .data = samx7_restart },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, at91_reset_of_match);