From mboxrd@z Thu Jan 1 00:00:00 1970 From: jason@lakedaemon.net (Jason Cooper) Date: Mon, 17 Feb 2014 16:08:22 -0500 Subject: [PATCH v7 11/18] watchdog: orion: Add per-compatible watchdog start implementation In-Reply-To: <1392073237-2554-12-git-send-email-ezequiel.garcia@free-electrons.com> References: <1392073237-2554-1-git-send-email-ezequiel.garcia@free-electrons.com> <1392073237-2554-12-git-send-email-ezequiel.garcia@free-electrons.com> Message-ID: <20140217210822.GC7862@titan.lakedaemon.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Feb 10, 2014 at 08:00:30PM -0300, Ezequiel Garcia wrote: > To handle differences between SoCs this commit adds per-compatible > string start() function for the watchdog kick-off. This is preparation > work and makes no functionality changes to the current driver. > > Reviewed-by: Guenter Roeck > Tested-by: Sebastian Hesselbarth > Tested-by: Willy Tarreau > Signed-off-by: Ezequiel Garcia > --- > drivers/watchdog/orion_wdt.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c > index b48fd08..3925297 100644 > --- a/drivers/watchdog/orion_wdt.c > +++ b/drivers/watchdog/orion_wdt.c > @@ -50,6 +50,7 @@ struct orion_watchdog_data { > int rstout_enable_bit; > int (*clock_init)(struct platform_device *, > struct orion_watchdog *); this... > + int (*start)(struct watchdog_device *); > }; > > struct orion_watchdog { ... > @@ -193,6 +202,7 @@ static const struct orion_watchdog_data orion_data = { > .wdt_enable_bit = BIT(4), > .wdt_counter_offset = 0x24, > .clock_init = orion_wdt_clock_init, and this... > + .start = orion_start, > }; cause a failure to apply the patch. I hand-jammed it (attached), please let me know what is going on here (missed dep?) thx, Jason. -----------8<----------------- commit 14181fe244605b53829ec87f9f6af85d5ec2f8ce Author: Ezequiel Garcia Date: Mon Feb 10 20:00:30 2014 -0300 watchdog: orion: Add per-compatible watchdog start implementation To handle differences between SoCs this commit adds per-compatible string start() function for the watchdog kick-off. This is preparation work and makes no functionality changes to the current driver. Reviewed-by: Guenter Roeck Tested-by: Sebastian Hesselbarth Tested-by: Willy Tarreau Signed-off-by: Ezequiel Garcia Acked-by: Wim Van Sebroeck Signed-off-by: Jason Cooper diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index b220e34285d1..573859cff72f 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -46,6 +46,7 @@ struct orion_watchdog_data { int wdt_counter_offset; int wdt_enable_bit; int rstout_enable_bit; + int (*start)(struct watchdog_device *); }; struct orion_watchdog { @@ -66,7 +67,7 @@ static int orion_wdt_ping(struct watchdog_device *wdt_dev) return 0; } -static int orion_wdt_start(struct watchdog_device *wdt_dev) +static int orion_start(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); @@ -85,6 +86,14 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) return 0; } +static int orion_wdt_start(struct watchdog_device *wdt_dev) +{ + struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + + /* There are some per-SoC quirks to handle */ + return dev->data->start(wdt_dev); +} + static int orion_wdt_stop(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); @@ -172,6 +181,7 @@ static const struct orion_watchdog_data orion_data = { .rstout_enable_bit = BIT(1), .wdt_enable_bit = BIT(4), .wdt_counter_offset = 0x24, + .start = orion_start, }; static const struct of_device_id orion_wdt_of_match_table[] = {