* [PATCH v2 1/3] watchdog: sunxi: Change compatibles
2014-02-07 21:29 [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
@ 2014-02-07 21:29 ` Maxime Ripard
2014-02-07 21:29 ` [PATCH v2 2/3] ARM: sunxi: Add the new watchog compatibles to the reboot code Maxime Ripard
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2014-02-07 21:29 UTC (permalink / raw)
To: linux-arm-kernel
The Allwinner A10 and A31 compatibles were following a slightly different
compatible patterns than the rest of the SoCs for historical reasons. Change
the compatibles to match the other pattern in the watchdog controller driver
for consistency.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 6 +++---
drivers/watchdog/sunxi_wdt.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index e39cb26..b8f75c5 100644
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@ -2,13 +2,13 @@ Allwinner SoCs Watchdog timer
Required properties:
-- compatible : should be "allwinner,<soc-family>-wdt", the currently supported
- SoC families being sun4i and sun6i
+- compatible : should be either "allwinner,sun4i-a10-wdt" or
+ "allwinner,sun6i-a31-wdt"
- reg : Specifies base physical address and size of the registers.
Example:
wdt: watchdog at 01c20c90 {
- compatible = "allwinner,sun4i-wdt";
+ compatible = "allwinner,sun4i-a10-wdt";
reg = <0x01c20c90 0x10>;
};
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 76332d8..cd00a78 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -205,7 +205,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev)
}
static const struct of_device_id sunxi_wdt_dt_ids[] = {
- { .compatible = "allwinner,sun4i-wdt" },
+ { .compatible = "allwinner,sun4i-a10-wdt" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] ARM: sunxi: Add the new watchog compatibles to the reboot code
2014-02-07 21:29 [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
2014-02-07 21:29 ` [PATCH v2 1/3] watchdog: sunxi: Change compatibles Maxime Ripard
@ 2014-02-07 21:29 ` Maxime Ripard
2014-02-07 21:29 ` [PATCH v2 3/3] ARM: sunxi: dt: Update the watchdog compatibles Maxime Ripard
2014-03-03 10:40 ` [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
3 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2014-02-07 21:29 UTC (permalink / raw)
To: linux-arm-kernel
Now that the watchdog driver has new compatibles, we need to support them in
the machine reboot code.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/mach-sunxi/sunxi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index aeea6ce..460b5a4 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -94,8 +94,8 @@ static void sun6i_restart(enum reboot_mode mode, const char *cmd)
}
static struct of_device_id sunxi_restart_ids[] = {
- { .compatible = "allwinner,sun4i-wdt" },
- { .compatible = "allwinner,sun6i-wdt" },
+ { .compatible = "allwinner,sun4i-a10-wdt" },
+ { .compatible = "allwinner,sun6i-a31-wdt" },
{ /*sentinel*/ }
};
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 3/3] ARM: sunxi: dt: Update the watchdog compatibles
2014-02-07 21:29 [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
2014-02-07 21:29 ` [PATCH v2 1/3] watchdog: sunxi: Change compatibles Maxime Ripard
2014-02-07 21:29 ` [PATCH v2 2/3] ARM: sunxi: Add the new watchog compatibles to the reboot code Maxime Ripard
@ 2014-02-07 21:29 ` Maxime Ripard
2014-03-03 10:40 ` [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
3 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2014-02-07 21:29 UTC (permalink / raw)
To: linux-arm-kernel
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 26cf191..3e066b5 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -426,7 +426,7 @@
};
wdt: watchdog at 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 b114be7..cff37c5 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -387,7 +387,7 @@
};
wdt: watchdog at 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 5c121fc..0ecde81 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -351,7 +351,7 @@
};
wdt: watchdog at 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 d3f1995..2d2ff8a 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -289,7 +289,7 @@
};
wdt1: watchdog at 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 4fbe530..30d1eb4 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -471,7 +471,7 @@
};
wdt: watchdog at 01c20c90 {
- compatible = "allwinner,sun4i-wdt";
+ compatible = "allwinner,sun4i-a10-wdt";
reg = <0x01c20c90 0x10>;
};
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns
2014-02-07 21:29 [PATCH v2 0/3] watchdog: sunxi: Change compatible patterns Maxime Ripard
` (2 preceding siblings ...)
2014-02-07 21:29 ` [PATCH v2 3/3] ARM: sunxi: dt: Update the watchdog compatibles Maxime Ripard
@ 2014-03-03 10:40 ` Maxime Ripard
[not found] ` <20140311205405.GA10228@spo001.leaseweb.com>
3 siblings, 1 reply; 8+ messages in thread
From: Maxime Ripard @ 2014-03-03 10:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi Wim,
On Fri, Feb 07, 2014 at 10:29:23PM +0100, Maxime Ripard wrote:
> Hi,
>
> This is the second version of the A10 watchdog compatible changes.
> The only difference with the v1 being that we're now droping the old
> compatibles, instead of keeping them, since the DT maintainers said it was
> fine.
>
> Thanks,
> Maxime
>
> Maxime Ripard (3):
> watchdog: sunxi: Change compatibles
> ARM: sunxi: Add the new watchog compatibles to the reboot code
> ARM: sunxi: dt: Update the watchdog compatibles
Ping?
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140303/61770bbc/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread