You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
2.5 KiB
87 lines
2.5 KiB
11 years ago
|
From 0dba36162dffdee935287645d515f53057de3537 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||
|
|
Date: Sun, 2 Feb 2014 14:55:25 +0100
|
||
|
|
Subject: [PATCH] ARM: sunxi: dt: Update the watchdog compatibles
|
||
|
|
|
||
|
|
The watchdog compatibles were following a different pattern than the one found
|
||
|
|
in the other devices. Now that the driver supports the right pattern, switch to
|
||
|
|
it in the DT.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
|
||
|
|
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
|
||
|
|
arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
|
||
|
|
arch/arm/boot/dts/sun6i-a31.dtsi | 2 +-
|
||
|
|
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
|
||
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||
|
|
index 80bbdeb..3a5775c 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
|
||
|
|
@@ -545,7 +545,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
wdt: watchdog@01c20c90 {
|
||
|
|
- compatible = "allwinner,sun4i-wdt";
|
||
|
|
+ compatible = "allwinner,sun4i-a10-wdt";
|
||
|
|
reg = <0x01c20c90 0x10>;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
|
||
|
|
index a5431ed..e5064dc 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
|
||
|
|
@@ -467,7 +467,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
wdt: watchdog@01c20c90 {
|
||
|
|
- compatible = "allwinner,sun4i-wdt";
|
||
|
|
+ compatible = "allwinner,sun4i-a10-wdt";
|
||
|
|
reg = <0x01c20c90 0x10>;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
|
||
|
|
index 7fe9cdc..b0cc56c 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
|
||
|
|
@@ -413,7 +413,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
wdt: watchdog@01c20c90 {
|
||
|
|
- compatible = "allwinner,sun4i-wdt";
|
||
|
|
+ compatible = "allwinner,sun4i-a10-wdt";
|
||
|
|
reg = <0x01c20c90 0x10>;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
|
||
|
|
index b4407f17..c15f30e 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
|
||
|
|
@@ -289,7 +289,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
wdt1: watchdog@01c20ca0 {
|
||
|
|
- compatible = "allwinner,sun6i-wdt";
|
||
|
|
+ compatible = "allwinner,sun6i-a31-wdt";
|
||
|
|
reg = <0x01c20ca0 0x20>;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
|
||
|
|
index e67924a..1961751 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
|
||
|
|
@@ -659,7 +659,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
wdt: watchdog@01c20c90 {
|
||
|
|
- compatible = "allwinner,sun4i-wdt";
|
||
|
|
+ compatible = "allwinner,sun4i-a10-wdt";
|
||
|
|
reg = <0x01c20c90 0x10>;
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|