Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b0ea574 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Wim Van Sebroeck
Browse files

watchdog: orion: Introduce per-SoC enabled() function 



In order to support other SoCs, it's needed to have a different enabled()
implementation for each SoC. This commit adds no functionality, and it
consists of preparation work.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Tested-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent ebf5cf76

drivers/watchdog/orion_wdt.c

+13 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct orion_watchdog_data { 
	int rstout_enable_bit;

	int (*clock_init)(struct platform_device *,

			  struct orion_watchdog *);

	int (*enabled)(struct orion_watchdog *);

	int (*start)(struct watchdog_device *);

	int (*stop)(struct watchdog_device *);

};
@@ -229,7 +230,7 @@ static int orion_wdt_stop(struct watchdog_device *wdt_dev) 
	return dev->data->stop(wdt_dev);

}



static int orion_wdt_enabled(struct orion_watchdog *dev)

static int orion_enabled(struct orion_watchdog *dev)

{

	bool enabled, running;
@@ -239,6 +240,13 @@ static int orion_wdt_enabled(struct orion_watchdog *dev) 
	return enabled && running;

}



static int orion_wdt_enabled(struct watchdog_device *wdt_dev)

{

	struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);



	return dev->data->enabled(dev);

}



static unsigned int orion_wdt_get_timeleft(struct watchdog_device *wdt_dev)

{

	struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
@@ -300,6 +308,7 @@ static const struct orion_watchdog_data orion_data = { 
	.wdt_enable_bit = BIT(4),

	.wdt_counter_offset = 0x24,

	.clock_init = orion_wdt_clock_init,

	.enabled = orion_enabled,

	.start = orion_start,

	.stop = orion_stop,

};
@@ -309,6 +318,7 @@ static const struct orion_watchdog_data armada370_data = { 
	.wdt_enable_bit = BIT(8),

	.wdt_counter_offset = 0x34,

	.clock_init = armada370_wdt_clock_init,

	.enabled = orion_enabled,

	.start = armada370_start,

	.stop = armada370_stop,

};
@@ -318,6 +328,7 @@ static const struct orion_watchdog_data armadaxp_data = { 
	.wdt_enable_bit = BIT(8),

	.wdt_counter_offset = 0x34,

	.clock_init = armadaxp_wdt_clock_init,

	.enabled = orion_enabled,

	.start = armada370_start,

	.stop = armada370_stop,

};
@@ -424,7 +435,7 @@ static int orion_wdt_probe(struct platform_device *pdev) 
	 * removed and re-insterted, or if the bootloader explicitly

	 * set a running watchdog before booting the kernel.

	 */

	if (!orion_wdt_enabled(dev))

	if (!orion_wdt_enabled(&dev->wdt))

		orion_wdt_stop(&dev->wdt);



	/* Request the IRQ only after the watchdog is disabled */