* [PATCH 0/2] ARM: dts: aspeed: Watchdog fixes
@ 2017-10-04 9:16 Joel Stanley
2017-10-04 9:16 ` [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Joel Stanley
2017-10-04 9:16 ` [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Joel Stanley
0 siblings, 2 replies; 5+ messages in thread
From: Joel Stanley @ 2017-10-04 9:16 UTC (permalink / raw)
To: linux-arm-kernel
A cleanup and a change in the default behaviour for the watchdog nodes to match
what is required to boot with commonly shipped u-boots.
Joel Stanley (2):
ARM: dts: aspeed: Remove undocumented wdt properties
ARM: dts: aspeed: Enable watchdog two
arch/arm/boot/dts/aspeed-g4.dtsi | 8 ++------
arch/arm/boot/dts/aspeed-g5.dtsi | 9 +++------
2 files changed, 5 insertions(+), 12 deletions(-)
--
2.14.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties
2017-10-04 9:16 [PATCH 0/2] ARM: dts: aspeed: Watchdog fixes Joel Stanley
@ 2017-10-04 9:16 ` Joel Stanley
2017-10-04 11:14 ` Andrew Jeffery
2017-10-04 9:16 ` [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Joel Stanley
1 sibling, 1 reply; 5+ messages in thread
From: Joel Stanley @ 2017-10-04 9:16 UTC (permalink / raw)
To: linux-arm-kernel
The watchdog bindings do not describe an interrupt property nor clock
phandle, and the upstream driver never had code to use them. Drop them
from the device tree.
Also rename the node from wdt the more commonly used watchdog.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++-----
arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++-----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index e455bd236798..5be2e6a39917 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -204,17 +204,14 @@
status = "disabled";
};
- wdt1: wdt at 1e785000 {
+ wdt1: watchdog at 1e785000 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785000 0x1c>;
- interrupts = <27>;
};
- wdt2: wdt at 1e785020 {
+ wdt2: watchdog at 1e785020 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785020 0x1c>;
- interrupts = <27>;
- clocks = <&clk_apb>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 77dded187d5a..71e1264b81aa 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -248,20 +248,18 @@
status = "disabled";
};
- wdt1: wdt at 1e785000 {
+ wdt1: watchdog at 1e785000 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785000 0x20>;
- interrupts = <27>;
};
- wdt2: wdt at 1e785020 {
+ wdt2: watchdog at 1e785020 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785020 0x20>;
- interrupts = <27>;
status = "disabled";
};
- wdt3: wdt at 1e785040 {
+ wdt3: watchdog at 1e785040 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785040 0x20>;
status = "disabled";
--
2.14.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties
2017-10-04 9:16 ` [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Joel Stanley
@ 2017-10-04 11:14 ` Andrew Jeffery
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2017-10-04 11:14 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2017-10-04 at 19:46 +1030, Joel Stanley wrote:
> The watchdog bindings do not describe an interrupt property nor clock
> phandle, and the upstream driver never had code to use them. Drop them
> from the device tree.
>?
> Also rename the node from wdt the more commonly used watchdog.
>?
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> ?arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++-----
> ?arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++-----
> ?2 files changed, 5 insertions(+), 10 deletions(-)
>?
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index e455bd236798..5be2e6a39917 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -204,17 +204,14 @@
> ? status = "disabled";
> ? };
> ?
> - wdt1: wdt at 1e785000 {
> + wdt1: watchdog at 1e785000 {
> ? compatible = "aspeed,ast2400-wdt";
> ? reg = <0x1e785000 0x1c>;
> - interrupts = <27>;
> ? };
> ?
> - wdt2: wdt at 1e785020 {
> + wdt2: watchdog at 1e785020 {
> ? compatible = "aspeed,ast2400-wdt";
> ? reg = <0x1e785020 0x1c>;
> - interrupts = <27>;
> - clocks = <&clk_apb>;
> ? status = "disabled";
> ? };
> ?
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index 77dded187d5a..71e1264b81aa 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -248,20 +248,18 @@
> ? status = "disabled";
> ? };
> ?
> - wdt1: wdt at 1e785000 {
> + wdt1: watchdog at 1e785000 {
> ? compatible = "aspeed,ast2500-wdt";
> ? reg = <0x1e785000 0x20>;
> - interrupts = <27>;
> ? };
> ?
> - wdt2: wdt at 1e785020 {
> + wdt2: watchdog at 1e785020 {
> ? compatible = "aspeed,ast2500-wdt";
> ? reg = <0x1e785020 0x20>;
> - interrupts = <27>;
> ? status = "disabled";
> ? };
> ?
> - wdt3: wdt at 1e785040 {
> + wdt3: watchdog at 1e785040 {
> ? compatible = "aspeed,ast2500-wdt";
> ? reg = <0x1e785040 0x20>;
> ? status = "disabled";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171004/3ca64410/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two
2017-10-04 9:16 [PATCH 0/2] ARM: dts: aspeed: Watchdog fixes Joel Stanley
2017-10-04 9:16 ` [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Joel Stanley
@ 2017-10-04 9:16 ` Joel Stanley
2017-10-04 11:15 ` Andrew Jeffery
1 sibling, 1 reply; 5+ messages in thread
From: Joel Stanley @ 2017-10-04 9:16 UTC (permalink / raw)
To: linux-arm-kernel
The second watchdog is left running by u-boot in the common
configurations of the firmware shipped on ASPEED boards. Ensure a driver
is loaded so the system can succcessfully boot.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 1 -
arch/arm/boot/dts/aspeed-g5.dtsi | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 5be2e6a39917..9bf84d2ba038 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -212,7 +212,6 @@
wdt2: watchdog at 1e785020 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785020 0x1c>;
- status = "disabled";
};
vuart: serial at 1e787000 {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 71e1264b81aa..ca023e9ab0b8 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -256,7 +256,6 @@
wdt2: watchdog at 1e785020 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785020 0x20>;
- status = "disabled";
};
wdt3: watchdog at 1e785040 {
--
2.14.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two
2017-10-04 9:16 ` [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Joel Stanley
@ 2017-10-04 11:15 ` Andrew Jeffery
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2017-10-04 11:15 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2017-10-04 at 19:46 +1030, Joel Stanley wrote:
> The second watchdog is left running by u-boot in the common
> configurations of the firmware shipped on ASPEED boards. Ensure a driver
> is loaded so the system can succcessfully boot.
>?
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> ?arch/arm/boot/dts/aspeed-g4.dtsi | 1 -
> ?arch/arm/boot/dts/aspeed-g5.dtsi | 1 -
> ?2 files changed, 2 deletions(-)
>?
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index 5be2e6a39917..9bf84d2ba038 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -212,7 +212,6 @@
> ? wdt2: watchdog at 1e785020 {
> ? compatible = "aspeed,ast2400-wdt";
> ? reg = <0x1e785020 0x1c>;
> - status = "disabled";
> ? };
> ?
> ? vuart: serial at 1e787000 {
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index 71e1264b81aa..ca023e9ab0b8 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -256,7 +256,6 @@
> ? wdt2: watchdog at 1e785020 {
> ? compatible = "aspeed,ast2500-wdt";
> ? reg = <0x1e785020 0x20>;
> - status = "disabled";
> ? };
> ?
> ? wdt3: watchdog at 1e785040 {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171004/e9d5f527/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-04 11:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-04 9:16 [PATCH 0/2] ARM: dts: aspeed: Watchdog fixes Joel Stanley
2017-10-04 9:16 ` [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Joel Stanley
2017-10-04 11:14 ` Andrew Jeffery
2017-10-04 9:16 ` [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Joel Stanley
2017-10-04 11:15 ` Andrew Jeffery
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).