* [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: Joel Stanley, Rob Herring, Mark Rutland Cc: Russell King, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Andrew Jeffery, Cédric Le Goater, linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ 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 [not found] ` <20171004091635.12499-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org> 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: Joel Stanley, Rob Herring, Mark Rutland Cc: Russell King, devicetree, linux-arm-kernel, linux-kernel, Andrew Jeffery, Cédric Le Goater, linux-aspeed 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@1e785000 { + wdt1: watchdog@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; - interrupts = <27>; }; - wdt2: wdt@1e785020 { + wdt2: watchdog@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@1e785000 { + wdt1: watchdog@1e785000 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785000 0x20>; - interrupts = <27>; }; - wdt2: wdt@1e785020 { + wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; - interrupts = <27>; status = "disabled"; }; - wdt3: wdt@1e785040 { + wdt3: watchdog@1e785040 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785040 0x20>; status = "disabled"; -- 2.14.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <20171004091635.12499-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>]
* Re: [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties [not found] ` <20171004091635.12499-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org> @ 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: Joel Stanley, Rob Herring, Mark Rutland Cc: Russell King, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Cédric Le Goater, linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ [-- Attachment #1: Type: text/plain, Size: 2175 bytes --] 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-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org> Reviewed-by: Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org> > --- > 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@1e785000 { > + wdt1: watchdog@1e785000 { > compatible = "aspeed,ast2400-wdt"; > reg = <0x1e785000 0x1c>; > - interrupts = <27>; > }; > > - wdt2: wdt@1e785020 { > + wdt2: watchdog@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@1e785000 { > + wdt1: watchdog@1e785000 { > compatible = "aspeed,ast2500-wdt"; > reg = <0x1e785000 0x20>; > - interrupts = <27>; > }; > > - wdt2: wdt@1e785020 { > + wdt2: watchdog@1e785020 { > compatible = "aspeed,ast2500-wdt"; > reg = <0x1e785020 0x20>; > - interrupts = <27>; > status = "disabled"; > }; > > - wdt3: wdt@1e785040 { > + wdt3: watchdog@1e785040 { > compatible = "aspeed,ast2500-wdt"; > reg = <0x1e785040 0x20>; > status = "disabled"; [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ 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: Joel Stanley, Rob Herring, Mark Rutland Cc: Russell King, devicetree, linux-arm-kernel, linux-kernel, Andrew Jeffery, Cédric Le Goater, linux-aspeed 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@1e785020 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785020 0x1c>; - status = "disabled"; }; vuart: serial@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@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; - status = "disabled"; }; wdt3: watchdog@1e785040 { -- 2.14.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [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: Joel Stanley, Rob Herring, Mark Rutland Cc: Russell King, devicetree, linux-arm-kernel, linux-kernel, Cédric Le Goater, linux-aspeed [-- Attachment #1: Type: text/plain, Size: 1336 bytes --] 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@1e785020 { > compatible = "aspeed,ast2400-wdt"; > reg = <0x1e785020 0x1c>; > - status = "disabled"; > }; > > vuart: serial@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@1e785020 { > compatible = "aspeed,ast2500-wdt"; > reg = <0x1e785020 0x20>; > - status = "disabled"; > }; > > wdt3: watchdog@1e785040 { [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ 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
[not found] ` <20171004091635.12499-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
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).