* [PATCH 0/2] ARM: davinci: da850: add wdt DT node @ 2013-01-24 8:38 Kumar, Anil 2013-01-24 8:38 ` [PATCH 1/2] " Kumar, Anil 2013-01-24 8:38 ` [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry Kumar, Anil 0 siblings, 2 replies; 7+ messages in thread From: Kumar, Anil @ 2013-01-24 8:38 UTC (permalink / raw) To: linux-arm-kernel Add wdt DT node and OF_DEV_AUXDATA for wdt driver in da850 board dt file to use wdt clock. This series applies on top of v3.8-rc4. This is tested on da850 EVM. Test Procedure: $watchdog -F /dev/watchdog (Device should not reboot) After wdt heartbeat timeout(DEFAULT_HEARTBEAT is 60 sec) $ctr + c (Device should reboot after heartbeat timeout) Kumar, Anil (2): ARM: davinci: da850: add wdt DT node ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry arch/arm/boot/dts/da850-evm.dts | 3 +++ arch/arm/boot/dts/da850.dtsi | 5 +++++ arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: davinci: da850: add wdt DT node 2013-01-24 8:38 [PATCH 0/2] ARM: davinci: da850: add wdt DT node Kumar, Anil @ 2013-01-24 8:38 ` Kumar, Anil 2013-01-24 8:38 ` [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry Kumar, Anil 1 sibling, 0 replies; 7+ messages in thread From: Kumar, Anil @ 2013-01-24 8:38 UTC (permalink / raw) To: linux-arm-kernel Add da850 wdt DT node. Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> --- :100644 100644 37dc5a3... 4666ce9... M arch/arm/boot/dts/da850-evm.dts :100644 100644 640ab75... 08bf974... M arch/arm/boot/dts/da850.dtsi arch/arm/boot/dts/da850-evm.dts | 3 +++ arch/arm/boot/dts/da850.dtsi | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 37dc5a3..4666ce9 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -24,5 +24,8 @@ serial2: serial at 1d0d000 { status = "okay"; }; + wdt: wdt at 1c21000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 640ab75..08bf974 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -56,5 +56,10 @@ interrupt-parent = <&intc>; status = "disabled"; }; + wdt: wdt at 1c21000 { + compatible = "ti,davinci-wdt"; + reg = <0x21000 0xfff>; + status = "disabled"; + }; }; }; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry 2013-01-24 8:38 [PATCH 0/2] ARM: davinci: da850: add wdt DT node Kumar, Anil 2013-01-24 8:38 ` [PATCH 1/2] " Kumar, Anil @ 2013-01-24 8:38 ` Kumar, Anil 2013-02-04 11:50 ` Sekhar Nori 1 sibling, 1 reply; 7+ messages in thread From: Kumar, Anil @ 2013-01-24 8:38 UTC (permalink / raw) To: linux-arm-kernel Add OF_DEV_AUXDATA for wdt driver in da850 board dt file to use wdt clock. Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> --- :100644 100644 37c27af... 1b295d2... M arch/arm/mach-davinci/da8xx-dt.c arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..1b295d2 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -37,11 +37,17 @@ static void __init da8xx_init_irq(void) of_irq_init(da8xx_irq_match); } +struct of_dev_auxdata da850_evm_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("ti,davinci-wdt", 0x1c21000, "watchdog", NULL), + {} +}; + #ifdef CONFIG_ARCH_DAVINCI_DA850 static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, + da850_evm_auxdata_lookup, NULL); da8xx_uart_clk_enable(); } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry 2013-01-24 8:38 ` [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry Kumar, Anil @ 2013-02-04 11:50 ` Sekhar Nori 2013-02-04 12:00 ` Sergei Shtylyov 2013-02-05 1:51 ` Kumar, Anil 0 siblings, 2 replies; 7+ messages in thread From: Sekhar Nori @ 2013-02-04 11:50 UTC (permalink / raw) To: linux-arm-kernel Hi Anil, On 1/24/2013 2:08 PM, Kumar, Anil wrote: > Add OF_DEV_AUXDATA for wdt driver in da850 board dt > file to use wdt clock. > > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > --- > :100644 100644 37c27af... 1b295d2... M arch/arm/mach-davinci/da8xx-dt.c > arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > index 37c27af..1b295d2 100644 > --- a/arch/arm/mach-davinci/da8xx-dt.c > +++ b/arch/arm/mach-davinci/da8xx-dt.c > @@ -37,11 +37,17 @@ static void __init da8xx_init_irq(void) > of_irq_init(da8xx_irq_match); > } > > +struct of_dev_auxdata da850_evm_auxdata_lookup[] __initdata = { Auxdata is not evm specific. This can instead be called da850_auxdata_lookup[]. Also, I dont think it is necessary to add auxdata in a separate patch from dt nodes. So, I fixed these issues and came up with below patch. I tested basic wdt reboot. reboot command is still broken (with or without this patch). Can you please look at that? Thanks, Sekhar ----8<---- From: "Kumar, Anil" <anilkumar.v@ti.com> Date: Thu, 24 Jan 2013 14:08:14 +0530 Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node Add da850 wdt DT node. Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> --- arch/arm/boot/dts/da850-evm.dts | 3 +++ arch/arm/boot/dts/da850.dtsi | 5 +++++ arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index fa04152..cc777dc 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -30,6 +30,9 @@ rtc0: rtc at 1c23000 { status = "okay"; }; + wdt: wdt at 1c21000 { + status = "okay"; + }; }; nand_cs3 at 62000000 { status = "okay"; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 8dd15c0..2800090 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -88,6 +88,11 @@ 19>; status = "disabled"; }; + wdt: wdt at 1c21000 { + compatible = "ti,davinci-wdt"; + reg = <0x21000 0xfff>; + status = "disabled"; + }; }; nand_cs3 at 62000000 { compatible = "ti,davinci-nand"; diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..90c3c69 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -37,11 +37,17 @@ static void __init da8xx_init_irq(void) of_irq_init(da8xx_irq_match); } +struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL), + {} +}; + #ifdef CONFIG_ARCH_DAVINCI_DA850 static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, + da850_auxdata_lookup, NULL); da8xx_uart_clk_enable(); } ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry 2013-02-04 11:50 ` Sekhar Nori @ 2013-02-04 12:00 ` Sergei Shtylyov 2013-02-05 6:39 ` Kumar, Anil 2013-02-05 1:51 ` Kumar, Anil 1 sibling, 1 reply; 7+ messages in thread From: Sergei Shtylyov @ 2013-02-04 12:00 UTC (permalink / raw) To: linux-arm-kernel Hello. On 04-02-2013 15:50, Sekhar Nori wrote: > Auxdata is not evm specific. This can instead be called da850_auxdata_lookup[]. > Also, I dont think it is necessary to add auxdata in a separate patch > from dt nodes. So, I fixed these issues and came up with below patch. I > tested basic wdt reboot. reboot command is still broken (with or > without this patch). Can you please look at that? > Thanks, > Sekhar > ----8<---- > From: "Kumar, Anil" <anilkumar.v@ti.com> > Date: Thu, 24 Jan 2013 14:08:14 +0530 > Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node > Add da850 wdt DT node. > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > Signed-off-by: Sekhar Nori <nsekhar@ti.com> [...] > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index 8dd15c0..2800090 100644 > --- a/arch/arm/boot/dts/da850.dtsi > +++ b/arch/arm/boot/dts/da850.dtsi > @@ -88,6 +88,11 @@ > 19>; > status = "disabled"; > }; > + wdt: wdt at 1c21000 { > + compatible = "ti,davinci-wdt"; > + reg = <0x21000 0xfff>; Not 0x1000? This is region size, not upper limit. WBR, Sergei ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry 2013-02-04 12:00 ` Sergei Shtylyov @ 2013-02-05 6:39 ` Kumar, Anil 0 siblings, 0 replies; 7+ messages in thread From: Kumar, Anil @ 2013-02-05 6:39 UTC (permalink / raw) To: linux-arm-kernel Hi Serqei, On Mon, Feb 04, 2013 at 17:30:20, Sergei Shtylyov wrote: > Hello. > > On 04-02-2013 15:50, Sekhar Nori wrote: > > > Auxdata is not evm specific. This can instead be called da850_auxdata_lookup[]. > > > Also, I dont think it is necessary to add auxdata in a separate patch > > from dt nodes. So, I fixed these issues and came up with below patch. I > > tested basic wdt reboot. reboot command is still broken (with or > > without this patch). Can you please look at that? > > > Thanks, > > Sekhar > > > ----8<---- > > From: "Kumar, Anil" <anilkumar.v@ti.com> > > Date: Thu, 24 Jan 2013 14:08:14 +0530 > > Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node > > > Add da850 wdt DT node. > > > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > [...] > > > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > > index 8dd15c0..2800090 100644 > > --- a/arch/arm/boot/dts/da850.dtsi > > +++ b/arch/arm/boot/dts/da850.dtsi > > @@ -88,6 +88,11 @@ > > 19>; > > status = "disabled"; > > }; > > + wdt: wdt at 1c21000 { > > + compatible = "ti,davinci-wdt"; > > + reg = <0x21000 0xfff>; > > Not 0x1000? This is region size, not upper limit. Oh, you are right. It should be 0x1000. Thanks for correcting. In da850 timer1 is used as wdt and according to da850 data sheet. Timer1 start address is 0x01C21000 Timer1 end address is 0x01C21FFF I had wrongly calculated upper limit. I will fix it. Thanks, Anil ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry 2013-02-04 11:50 ` Sekhar Nori 2013-02-04 12:00 ` Sergei Shtylyov @ 2013-02-05 1:51 ` Kumar, Anil 1 sibling, 0 replies; 7+ messages in thread From: Kumar, Anil @ 2013-02-05 1:51 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 04, 2013 at 17:20:55, Nori, Sekhar wrote: > Hi Anil, > > On 1/24/2013 2:08 PM, Kumar, Anil wrote: > > Add OF_DEV_AUXDATA for wdt driver in da850 board dt > > file to use wdt clock. > > > > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > > --- > > :100644 100644 37c27af... 1b295d2... M arch/arm/mach-davinci/da8xx-dt.c > > arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- > > 1 files changed, 7 insertions(+), 1 deletions(-) > > > > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > > index 37c27af..1b295d2 100644 > > --- a/arch/arm/mach-davinci/da8xx-dt.c > > +++ b/arch/arm/mach-davinci/da8xx-dt.c > > @@ -37,11 +37,17 @@ static void __init da8xx_init_irq(void) > > of_irq_init(da8xx_irq_match); > > } > > > > +struct of_dev_auxdata da850_evm_auxdata_lookup[] __initdata = { > > Auxdata is not evm specific. This can instead be called da850_auxdata_lookup[]. ok > > Also, I dont think it is necessary to add auxdata in a separate patch > from dt nodes. So, I fixed these issues and came up with below patch. I > tested basic wdt reboot. reboot command is still broken (with or > without this patch). Can you please look at that? > ok, I will look into reboot command issue. > Thanks, > Sekhar > > ----8<---- > From: "Kumar, Anil" <anilkumar.v@ti.com> > Date: Thu, 24 Jan 2013 14:08:14 +0530 > Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node > > Add da850 wdt DT node. > > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > --- > arch/arm/boot/dts/da850-evm.dts | 3 +++ > arch/arm/boot/dts/da850.dtsi | 5 +++++ > arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- > 3 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts > index fa04152..cc777dc 100644 > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -30,6 +30,9 @@ > rtc0: rtc at 1c23000 { > status = "okay"; > }; > + wdt: wdt at 1c21000 { > + status = "okay"; > + }; > }; > nand_cs3 at 62000000 { > status = "okay"; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index 8dd15c0..2800090 100644 > --- a/arch/arm/boot/dts/da850.dtsi > +++ b/arch/arm/boot/dts/da850.dtsi > @@ -88,6 +88,11 @@ > 19>; > status = "disabled"; > }; > + wdt: wdt at 1c21000 { > + compatible = "ti,davinci-wdt"; > + reg = <0x21000 0xfff>; > + status = "disabled"; > + }; > }; > nand_cs3 at 62000000 { > compatible = "ti,davinci-nand"; > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > index 37c27af..90c3c69 100644 > --- a/arch/arm/mach-davinci/da8xx-dt.c > +++ b/arch/arm/mach-davinci/da8xx-dt.c > @@ -37,11 +37,17 @@ static void __init da8xx_init_irq(void) > of_irq_init(da8xx_irq_match); > } > > +struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { > + OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL), > + {} > +}; > + > #ifdef CONFIG_ARCH_DAVINCI_DA850 > > static void __init da850_init_machine(void) > { > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > + of_platform_populate(NULL, of_default_bus_match_table, > + da850_auxdata_lookup, NULL); > > da8xx_uart_clk_enable(); > } > > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-05 6:39 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-24 8:38 [PATCH 0/2] ARM: davinci: da850: add wdt DT node Kumar, Anil 2013-01-24 8:38 ` [PATCH 1/2] " Kumar, Anil 2013-01-24 8:38 ` [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry Kumar, Anil 2013-02-04 11:50 ` Sekhar Nori 2013-02-04 12:00 ` Sergei Shtylyov 2013-02-05 6:39 ` Kumar, Anil 2013-02-05 1:51 ` Kumar, Anil
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).