| Message ID | 1360123204-9978-2-git-send-email-anilkumar.v@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 2/6/2013 9:30 AM, Kumar, Anil wrote: > Add da850 wdt DT node. > Add OF_DEV_AUXDATA for wdt driver to use wdt clock. > > Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> > --- 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); These hunks clashed with Manish's I2C0 node addition. I resolved it locally. I pushed the commit to v3.9/dt-2 branch of my gitorious tree. Please use this as the baseline for further DT patches. Thanks, Sekhar
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@1d0d000 { status = "okay"; }; + wdt: wdt@1c21000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 640ab75..ffba00f 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@1c21000 { + compatible = "ti,davinci-wdt"; + reg = <0x21000 0x1000>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..01521ed 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(); }
Add da850 wdt DT node. Add OF_DEV_AUXDATA for wdt driver to use wdt clock. Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> --- Changes for V2: -Make single patch for wdt DT node and its OF_DEV_AUXDATA entry changes. :100644 100644 37dc5a3... 4666ce9... M arch/arm/boot/dts/da850-evm.dts :100644 100644 640ab75... ffba00f... M arch/arm/boot/dts/da850.dtsi :100644 100644 37c27af... 01521ed... M arch/arm/mach-davinci/da8xx-dt.c 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(-)