* Re: [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
[not found] <5af5c20f.1c69fb81.e968b.17c0SMTPIN_ADDED_MISSING@mx.google.com>
@ 2018-05-11 20:54 ` James Hogan
2018-05-11 21:14 ` Guenter Roeck
0 siblings, 1 reply; 6+ messages in thread
From: James Hogan @ 2018-05-11 20:54 UTC (permalink / raw)
To: Paul Cercueil
Cc: Wim Van Sebroeck, Mathieu Malaterre, Mark Rutland, Rob Herring,
linux-kernel, Guenter Roeck, devicetree, linux-watchdog,
Ralf Baechle, linux-mips
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
On Fri, May 11, 2018 at 01:17:04PM -0300, Paul Cercueil wrote:
> Le 11 mai 2018 11:52, James Hogan <jhogan@kernel.org> a écrit :
> > Otherwise
> > Acked-by: James Hogan <jhogan@kernel.org>
> >
> > I'm happy to apply for 4.18 with that change if you want it to go
> > through the MIPS tree.
>
> Yes please!
Done
Thanks
James
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
2018-05-11 20:54 ` [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver James Hogan
@ 2018-05-11 21:14 ` Guenter Roeck
2018-05-11 21:15 ` James Hogan
0 siblings, 1 reply; 6+ messages in thread
From: Guenter Roeck @ 2018-05-11 21:14 UTC (permalink / raw)
To: James Hogan
Cc: Paul Cercueil, Wim Van Sebroeck, Mathieu Malaterre, Mark Rutland,
Rob Herring, linux-kernel, devicetree, linux-watchdog,
Ralf Baechle, linux-mips
On Fri, May 11, 2018 at 09:54:14PM +0100, James Hogan wrote:
> On Fri, May 11, 2018 at 01:17:04PM -0300, Paul Cercueil wrote:
> > Le 11 mai 2018 11:52, James Hogan <jhogan@kernel.org> a écrit :
> > > Otherwise
> > > Acked-by: James Hogan <jhogan@kernel.org>
> > >
> > > I'm happy to apply for 4.18 with that change if you want it to go
> > > through the MIPS tree.
> >
> > Yes please!
>
> Done
>
Does that include the watchdog changes ? No problem with it, just asking to make
sure that those don't get lost.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
2018-05-11 21:14 ` Guenter Roeck
@ 2018-05-11 21:15 ` James Hogan
2018-05-11 21:30 ` Guenter Roeck
0 siblings, 1 reply; 6+ messages in thread
From: James Hogan @ 2018-05-11 21:15 UTC (permalink / raw)
To: Guenter Roeck
Cc: Paul Cercueil, Wim Van Sebroeck, Mathieu Malaterre, Mark Rutland,
Rob Herring, linux-kernel, devicetree, linux-watchdog,
Ralf Baechle, linux-mips
[-- Attachment #1: Type: text/plain, Size: 702 bytes --]
On Fri, May 11, 2018 at 02:14:16PM -0700, Guenter Roeck wrote:
> On Fri, May 11, 2018 at 09:54:14PM +0100, James Hogan wrote:
> > On Fri, May 11, 2018 at 01:17:04PM -0300, Paul Cercueil wrote:
> > > Le 11 mai 2018 11:52, James Hogan <jhogan@kernel.org> a écrit :
> > > > Otherwise
> > > > Acked-by: James Hogan <jhogan@kernel.org>
> > > >
> > > > I'm happy to apply for 4.18 with that change if you want it to go
> > > > through the MIPS tree.
> > >
> > > Yes please!
> >
> > Done
> >
> Does that include the watchdog changes ? No problem with it, just asking to make
> sure that those don't get lost.
Yes, I suppose I was taking your reviewed-by as an ack.
Cheers
James
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
2018-05-11 21:15 ` James Hogan
@ 2018-05-11 21:30 ` Guenter Roeck
0 siblings, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2018-05-11 21:30 UTC (permalink / raw)
To: James Hogan
Cc: Paul Cercueil, Wim Van Sebroeck, Mathieu Malaterre, Mark Rutland,
Rob Herring, linux-kernel, devicetree, linux-watchdog,
Ralf Baechle, linux-mips
On Fri, May 11, 2018 at 10:15:55PM +0100, James Hogan wrote:
> On Fri, May 11, 2018 at 02:14:16PM -0700, Guenter Roeck wrote:
> > On Fri, May 11, 2018 at 09:54:14PM +0100, James Hogan wrote:
> > > On Fri, May 11, 2018 at 01:17:04PM -0300, Paul Cercueil wrote:
> > > > Le 11 mai 2018 11:52, James Hogan <jhogan@kernel.org> a écrit :
> > > > > Otherwise
> > > > > Acked-by: James Hogan <jhogan@kernel.org>
> > > > >
> > > > > I'm happy to apply for 4.18 with that change if you want it to go
> > > > > through the MIPS tree.
> > > >
> > > > Yes please!
> > >
> > > Done
> > >
> > Does that include the watchdog changes ? No problem with it, just asking to make
> > sure that those don't get lost.
>
> Yes, I suppose I was taking your reviewed-by as an ack.
>
Ok.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
2018-05-10 18:47 ` [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver Paul Cercueil
@ 2018-05-11 14:52 ` James Hogan
0 siblings, 0 replies; 6+ messages in thread
From: James Hogan @ 2018-05-11 14:52 UTC (permalink / raw)
To: Paul Cercueil
Cc: Guenter Roeck, Rob Herring, Mark Rutland, Ralf Baechle,
Wim Van Sebroeck, Mathieu Malaterre, linux-watchdog, devicetree,
linux-kernel, linux-mips
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
On Thu, May 10, 2018 at 08:47:48PM +0200, Paul Cercueil wrote:
> Also remove the watchdog platform_device from platform.c, since it
> wasn't used anywhere anyway.
Nit: it'd be slightly nicer IMO if the patch body was a superset of the
subject line. It's fine to repeat what the subject says since thats
meant to summarise the body.
> -struct platform_device jz4740_wdt_device = {
There's an extern in arch/mips/include/asm/mach-jz4740/platform.h that
should perhaps be removed also?
Otherwise
Acked-by: James Hogan <jhogan@kernel.org>
I'm happy to apply for 4.18 with that change if you want it to go
through the MIPS tree.
Cheers
James
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
2018-05-10 18:47 [PATCH v3 1/8] watchdog: JZ4740: Disable clock after stopping counter Paul Cercueil
@ 2018-05-10 18:47 ` Paul Cercueil
2018-05-11 14:52 ` James Hogan
0 siblings, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2018-05-10 18:47 UTC (permalink / raw)
To: Guenter Roeck, Rob Herring, Mark Rutland, Ralf Baechle, James Hogan
Cc: Wim Van Sebroeck, Mathieu Malaterre, linux-watchdog, devicetree,
linux-kernel, linux-mips, Paul Cercueil
Also remove the watchdog platform_device from platform.c, since it
wasn't used anywhere anyway.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
arch/mips/boot/dts/ingenic/jz4740.dtsi | 8 ++++++++
arch/mips/jz4740/platform.c | 16 ----------------
2 files changed, 8 insertions(+), 16 deletions(-)
v2: No change
v3: No change
diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index cd5185bb90ae..26c6b561d6f7 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -45,6 +45,14 @@
#clock-cells = <1>;
};
+ watchdog: watchdog@10002000 {
+ compatible = "ingenic,jz4740-watchdog";
+ reg = <0x10002000 0x10>;
+
+ clocks = <&cgu JZ4740_CLK_RTC>;
+ clock-names = "rtc";
+ };
+
rtc_dev: rtc@10003000 {
compatible = "ingenic,jz4740-rtc";
reg = <0x10003000 0x40>;
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 5b7cdd67a9d9..cbc5f8e87230 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -233,22 +233,6 @@ struct platform_device jz4740_adc_device = {
.resource = jz4740_adc_resources,
};
-/* Watchdog */
-static struct resource jz4740_wdt_resources[] = {
- {
- .start = JZ4740_WDT_BASE_ADDR,
- .end = JZ4740_WDT_BASE_ADDR + 0x10 - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-struct platform_device jz4740_wdt_device = {
- .name = "jz4740-wdt",
- .id = -1,
- .num_resources = ARRAY_SIZE(jz4740_wdt_resources),
- .resource = jz4740_wdt_resources,
-};
-
/* PWM */
struct platform_device jz4740_pwm_device = {
.name = "jz4740-pwm",
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-11 21:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <5af5c20f.1c69fb81.e968b.17c0SMTPIN_ADDED_MISSING@mx.google.com>
2018-05-11 20:54 ` [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver James Hogan
2018-05-11 21:14 ` Guenter Roeck
2018-05-11 21:15 ` James Hogan
2018-05-11 21:30 ` Guenter Roeck
2018-05-10 18:47 [PATCH v3 1/8] watchdog: JZ4740: Disable clock after stopping counter Paul Cercueil
2018-05-10 18:47 ` [PATCH v3 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver Paul Cercueil
2018-05-11 14:52 ` James Hogan
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).