ARM: dts: aspeed: Update watchdog compatible strings

The string was changed when upstreaming the driver. Put the correct
string for generation 4 and 5 systems, as well as fix the reg length for
ast2500 systems.

Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 4e3f055b365c639860ccabcc87d25eda594a5c0a..857cc0c42820026efdeb9b48e9e93fa1d0537b27 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -898,13 +898,13 @@
                        };
 
                        wdt1: wdt@1e785000 {
-                               compatible = "aspeed,wdt";
+                               compatible = "aspeed,ast2400-wdt";
                                reg = <0x1e785000 0x1c>;
                                interrupts = <27>;
                        };
 
                        wdt2: wdt@1e785020 {
-                               compatible = "aspeed,wdt";
+                               compatible = "aspeed,ast2400-wdt";
                                reg = <0x1e785020 0x1c>;
                                interrupts = <27>;
                                clocks = <&clk_apb>;

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 9e0b86e404ba126895d9afe57ebf67672a21ff82..f7a81c988552389c9a7976b5f1473bfe55d2e843 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -1007,21 +1007,21 @@
 
 
                        wdt1: wdt@1e785000 {
-                               compatible = "aspeed,wdt";
-                               reg = <0x1e785000 0x1c>;
+                               compatible = "aspeed,ast2500-wdt";
+                               reg = <0x1e785000 0x20>;
                                interrupts = <27>;
                        };
 
                        wdt2: wdt@1e785020 {
-                               compatible = "aspeed,wdt";
-                               reg = <0x1e785020 0x1c>;
+                               compatible = "aspeed,ast2500-wdt";
+                               reg = <0x1e785020 0x20>;
                                interrupts = <27>;
                                status = "disabled";
                        };
 
                        wdt3: wdt@1e785040 {
-                               compatible = "aspeed,wdt";
-                               reg = <0x1e785074 0x1c>;
+                               compatible = "aspeed,ast2500-wdt";
+                               reg = <0x1e785040 0x20>;
                                status = "disabled";
                        };