From: Josh Wu <josh.wu@atmel.com>
Date: Mon, 20 Jul 2015 09:32:06 +0000 (+0800)
Subject: ARM: at91/dt: sama5: update rstc to correct compatible string
X-Git-Tag: MMI-PSA29.97-13-9~9490^2~12^2~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff02e485486225a21e4679d94d5a869d5eae1df2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: at91/dt: sama5: update rstc to correct compatible string

They'll use "atmel,sama5d3-rstc" for reset function.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: add the old compatible string as a fallback]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 9e2444b07bce..81ced62cedaf 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -1259,7 +1259,7 @@
 			};
 
 			rstc@fffffe00 {
-				compatible = "atmel,at91sam9g45-rstc";
+				compatible = "atmel,sama5d3-rstc", "atmel,at91sam9g45-rstc";
 				reg = <0xfffffe00 0x10>;
 			};
 
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 261b6acb7655..1fa8b3611a03 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1268,7 +1268,7 @@
 			};
 
 			rstc@fc068600 {
-				compatible = "atmel,at91sam9g45-rstc";
+				compatible = "atmel,sama5d3-rstc", "atmel,at91sam9g45-rstc";
 				reg = <0xfc068600 0x10>;
 			};