From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-f178.google.com ([209.85.212.178]:36413 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148AbbKGLEY (ORCPT ); Sat, 7 Nov 2015 06:04:24 -0500 Received: by wimw2 with SMTP id w2so44330312wim.1 for ; Sat, 07 Nov 2015 03:04:23 -0800 (PST) From: Carlo Caione To: linux@roeck-us.net, wim@iguana.be, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, drake@endlessm.com, jerry.cao@amlogic.com, victor.wan@amlogic.com, romain.perier@gmail.com Cc: Carlo Caione Subject: [PATCH v2 2/4] watchdog: meson: Add meson8b SoC specific data Date: Sat, 7 Nov 2015 12:02:17 +0100 Message-Id: <1446894139-6802-3-git-send-email-carlo@caione.org> In-Reply-To: <1446894139-6802-1-git-send-email-carlo@caione.org> References: <1446894139-6802-1-git-send-email-carlo@caione.org> Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org From: Carlo Caione Add SoC specific data in the watchdog driver for the meson8b SoC. Signed-off-by: Carlo Caione --- drivers/watchdog/meson_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 446af94..2e1fcf3 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = { .count_unit = 100000, /* 10 us */ }; +static struct meson_wdt_data meson8b_wdt_data = { + .enable = BIT(19), + .terminal_count_mask = 0xffff, + .count_unit = 7812, /* 128 us */ +}; + struct meson_wdt_dev { struct watchdog_device wdt_dev; void __iomem *wdt_base; @@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = { static const struct of_device_id meson_wdt_dt_ids[] = { { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data }, + { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: carlo@caione.org (Carlo Caione) Date: Sat, 7 Nov 2015 12:02:17 +0100 Subject: [PATCH v2 2/4] watchdog: meson: Add meson8b SoC specific data In-Reply-To: <1446894139-6802-1-git-send-email-carlo@caione.org> References: <1446894139-6802-1-git-send-email-carlo@caione.org> Message-ID: <1446894139-6802-3-git-send-email-carlo@caione.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Carlo Caione Add SoC specific data in the watchdog driver for the meson8b SoC. Signed-off-by: Carlo Caione --- drivers/watchdog/meson_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 446af94..2e1fcf3 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = { .count_unit = 100000, /* 10 us */ }; +static struct meson_wdt_data meson8b_wdt_data = { + .enable = BIT(19), + .terminal_count_mask = 0xffff, + .count_unit = 7812, /* 128 us */ +}; + struct meson_wdt_dev { struct watchdog_device wdt_dev; void __iomem *wdt_base; @@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = { static const struct of_device_id meson_wdt_dt_ids[] = { { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data }, + { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids); -- 1.9.1