watchdog: Convert orion_wdt driver to watchdog core
PATCH v2 1/1 watchdog: Convert orion_wdt driver to watchdog core
Convert the orion_wdt driver to the watchdog framework API.
---
v2: v1 does not apply to current tree. so I re-generate this patch.
drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 198 ++++++++++-------------------------------- 2 files changed, 48 insertions(+), 151 deletions(-)
drivers/watchdog/Kconfig +1 -0
@@ -277,6 +277,7 @@ config DAVINCI_WATCHDOG config ORION_WATCHDOG tristate "Orion watchdog" depends on ARCH_ORION5X || ARCH_KIRKWOOD + select WATCHDOG_CORE help Say Y here if to include support for the watchdog timer in the Marvell Orion5x and Kirkwood ARM SoCs.
drivers/watchdog/orion_wdt.c +47 -151
291 lines not on this page · raw message
Signature · 1 line
1.7.5.4
Quoted 2 lines · Axel Lin
Convert the
orion_wdtdriver to the watchdog framework API.
Hi Axel, thanks for the patch.
Quoted 7 lines
Signed-off-by Axel Lin <[email protected]>---
v2: v1 does not apply to current tree. so I re-generate this patch.drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 198 ++++++++++-------------------------------- 2 files changed, 48 insertions(+), 151 deletions(-)
...
Quoted 4 lines
drivers/watchdog/orion_wdt.c +0
-0
...
drivers/watchdog/orion_wdt.c line 33
Quoted 6 lines
drivers/watchdog/orion_wdt.c +1
-1@@ -31,7 +30,7 @@* Watchdog timer block registers. */ #define TIMER_CTRL 0x0000 -#define WDT_EN 0x0010 +#define WDT_EN 0x0010
nit, whitespace change.
...
drivers/watchdog/orion_wdt.c static int __devinit orion_wdt_probe(struct platform_device *pdev) · line 152
Quoted 12 lines
drivers/watchdog/orion_wdt.c +1
-3static int __devinit orion_wdt_probe (struct platform_device *pdev)@@ -241,26 +146,28 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)struct resource *res;int ret; -if (pdata) { - wdt_tclk = pdata->tclk; - }else { +if (!pdata) {pr_err ("misses platform data\n" );return -ENODEV ; }
Platform data is changing soon with devicetree support (and converting to common clock). Please don't change this if you don't need to.
Also, I'll include Andrew Lunn in the CC. He's doing the conversion of orion over to common clock, which affects this driver.
hth,
Jason.
Quoted 16 lines
drivers/watchdog/orion_wdt.c static int __devinit orion_wdt_probe(struct platform_device *pdev) · line 152
Quoted 12 lines
static int
__devinitorion_wdt_probe(struct platform_device *pdev)drivers/watchdog/orion_wdt.c +1
-3@@ -241,26 +146,28 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev)struct resource *res;int ret; -if (pdata) { - wdt_tclk = pdata->tclk; - }else { +if (!pdata) {pr_err ("misses platform data\n" );return -ENODEV ; }Platform data is changing soon with devicetree support (and converting to common clock). Please don't change this if you don't need to.
Quoted 2 lines
Also, I'll include Andrew Lunn in the CC. He's doing the conversion of orion over to common clock, which affects this driver.
Yep,
Once the merge is over and the first -rc kernel is released, i will post my patches rebased on that. For wdt, clk is no longer in the platform data.
Andrew