From patchwork Sat Nov 7 11:02:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 7575421 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 814009F36A for ; Sat, 7 Nov 2015 11:06:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0801206BA for ; Sat, 7 Nov 2015 11:06:26 +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 E5133206CE for ; Sat, 7 Nov 2015 11:06:25 +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 1Zv1Iu-0000tF-NP; Sat, 07 Nov 2015 11:05:04 +0000 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zv1Ia-0000j2-QI for linux-arm-kernel@lists.infradead.org; Sat, 07 Nov 2015 11:04:45 +0000 Received: by wimw2 with SMTP id w2so44330310wim.1 for ; Sat, 07 Nov 2015 03:04:23 -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=PDm0Lf2xnoW4iYTdd/o/5oF+NwK3XXovlQzlrj81XeE=; b=0OQYF6ZJKfM/uWvrcnM9D8ygDOXwPlj7hk7Qedi9/XNTwA4uN4lzaiNdVXNDT3lAvI eCPkcKUbllETCjpOqU8x4Z/DfImdzarceKr/sfcyj0vUeIx63Ncqm4nNP7nwszDooL7b 46uj1WsSsmSCmWGCY12eUYh1KjcvBPt7c5AXUcvCTwJB2M+j/RpU1WASgPzLmBlLS/HA 0FJeDpB2H/x2LSN/U/5kTDlLmJEgCYfz2+SJFvaitFDBa0vpYu2ubA086y0gTBKtyPzO J4mTFEl5+PIbLXDsdCNzibZFeIuJMUgmxyHNVnXJs12fNZatVAw/+F/YR59pykKsfVoi 8deQ== X-Received: by 10.194.129.135 with SMTP id nw7mr19966045wjb.148.1446894263329; Sat, 07 Nov 2015 03:04:23 -0800 (PST) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by smtp.gmail.com with ESMTPSA id e63sm3446425wma.7.2015.11.07.03.04.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Nov 2015 03:04:22 -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 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> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446894139-6802-1-git-send-email-carlo@caione.org> References: <1446894139-6802-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151107_030445_125252_D3E757A0 X-CRM114-Status: GOOD ( 11.39 ) X-Spam-Score: -2.4 (--) 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 --- 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);