aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Caione <carlo@endlessm.com>2015-11-08 07:18:55 -0500
committerWim Van Sebroeck <wim@iguana.be>2015-12-28 16:09:39 -0500
commit71388840ec360e0489be7a75971b595c729b5323 (patch)
tree1d606a0fb76e262a3c83cd3252a712a7c98b5561
parent943bf1f6466f81e3ac4322c6887a4f4d68452e7f (diff)
watchdog: meson: Add meson8b SoC specific data
Add SoC specific data in the watchdog driver for the meson8b SoC. Signed-off-by: Carlo Caione <carlo@endlessm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/meson_wdt.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 96036298529f..aea5d2f44ad7 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -50,6 +50,12 @@ static struct meson_wdt_data meson6_wdt_data = {
50 .count_unit = 100000, /* 10 us */ 50 .count_unit = 100000, /* 10 us */
51}; 51};
52 52
53static struct meson_wdt_data meson8b_wdt_data = {
54 .enable = BIT(19),
55 .terminal_count_mask = 0xffff,
56 .count_unit = 7812, /* 128 us */
57};
58
53struct meson_wdt_dev { 59struct meson_wdt_dev {
54 struct watchdog_device wdt_dev; 60 struct watchdog_device wdt_dev;
55 void __iomem *wdt_base; 61 void __iomem *wdt_base;
@@ -148,6 +154,7 @@ static const struct watchdog_ops meson_wdt_ops = {
148 154
149static const struct of_device_id meson_wdt_dt_ids[] = { 155static const struct of_device_id meson_wdt_dt_ids[] = {
150 { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data }, 156 { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
157 { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data },
151 { /* sentinel */ } 158 { /* sentinel */ }
152}; 159};
153MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids); 160MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);