Commit c5ec618f authored Sep 22, 2014 by Chen-Yu Tsai Committed by Wim Van Sebroeck Oct 20, 2014

watchdog: sunxi: Add A31 watchdog support



This patch adds support for the watchdog hardware found in A31 and
newer SoCs. This new hardware has registers at different offsets, and
the system reset control has been split out of the "mode" register
into a new "configuration" register.

Differences not supported by this driver include separate interrupt
lines for each watchdog, instead of sharing an interrupt line and
registers with the timer block.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent f2147de3

drivers/watchdog/sunxi_wdt.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -219,8 +219,18 @@ static const struct sunxi_wdt_reg sun4i_wdt_reg = {
		.wdt_reset_val = 0x02,
		};

		static const struct sunxi_wdt_reg sun6i_wdt_reg = {
		.wdt_ctrl = 0x10,
		.wdt_cfg = 0x14,
		.wdt_mode = 0x18,
		.wdt_timeout_shift = 4,
		.wdt_reset_mask = 0x03,
		.wdt_reset_val = 0x01,
		};

		static const struct of_device_id sunxi_wdt_dt_ids[] = {
		{ .compatible = "allwinner,sun4i-a10-wdt", .data = &sun4i_wdt_reg },
		{ .compatible = "allwinner,sun6i-a31-wdt", .data = &sun6i_wdt_reg },
		{ /* sentinel */ }
		};
		MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);

Admin message