From patchwork Sun Nov 8 12:18:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 7578221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EEFCF9F2F7 for ; Sun, 8 Nov 2015 12:22:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2261520546 for ; Sun, 8 Nov 2015 12:22:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D47F2053B for ; Sun, 8 Nov 2015 12:22:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZvOwS-0003cn-4H; Sun, 08 Nov 2015 12:19:28 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZvOwO-0003ak-0I for linux-arm-kernel@lists.infradead.org; Sun, 08 Nov 2015 12:19:25 +0000 Received: by wmec201 with SMTP id c201so48926917wme.1 for ; Sun, 08 Nov 2015 04:19:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zk6iPrCbqldsgvd6LV/AmS+OUJjibFiyxvnUJUtkA+o=; b=0UCoPjfloPvILuZTI8CLmPKJiEwD5PMcCqOIFpLV5vuMsi6283umvL0drFp1odsp3J Nck3afx5USGoWa/TeddlssbQIyufezkmrYbIIUYPquQeiiHEJWjXD0VU3dtnDBX+iYdS 2Dh9rH9FQjoC8hVsCfpyoVnv3WjtwQiqSrk17OoaCifXirKlZ+LOaiqsnZoyTeFgMFi5 nKu1oaAkF1OsOWcEEzXH/cUgC1NJImc/gAIFUX8vewJSrt7JLus7oeXRVVZW4N3FsupO JL3BSszwQ/IP70wFZkxm/k9zwzVpRMTACsOo/Ek7n+hJCsf69y1tgLcLTnVj7I5tftve FJWg== X-Received: by 10.28.55.7 with SMTP id e7mr18872162wma.18.1446985144366; Sun, 08 Nov 2015 04:19:04 -0800 (PST) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by smtp.gmail.com with ESMTPSA id hu2sm9762060wjb.21.2015.11.08.04.19.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Nov 2015 04:19:03 -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 Subject: [PATCH v3 2/4] watchdog: meson: Add meson8b SoC specific data Date: Sun, 8 Nov 2015 13:18:55 +0100 Message-Id: <1446985137-25498-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446985137-25498-1-git-send-email-carlo@caione.org> References: <1446985137-25498-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151108_041924_243231_A3B9CD78 X-CRM114-Status: GOOD ( 12.29 ) X-Spam-Score: -1.7 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlo Caione MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Carlo Caione Add SoC specific data in the watchdog driver for the meson8b SoC. Signed-off-by: Carlo Caione Reviewed-by: Guenter Roeck --- 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 89734f0..3ec1e91 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);