From patchwork Sun Jun 11 09:52:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 774337 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wlrtk3pHpz9s76 for ; Sun, 11 Jun 2017 19:53:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="hh99H6h3"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751565AbdFKJw6 (ORCPT ); Sun, 11 Jun 2017 05:52:58 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34040 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751546AbdFKJw5 (ORCPT ); Sun, 11 Jun 2017 05:52:57 -0400 Received: by mail-wr0-f193.google.com with SMTP id u101so15759611wrc.1; Sun, 11 Jun 2017 02:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JIWxc1wI7Cpfncnb3m4/WoPWVzgpv9LFDuady0MtgkI=; b=hh99H6h3ypF0Ei1wDFMlY9tOl60HzGqtjVFJEHys/iV/jLb1i+d7rQ2aiH9rxyFaJh aCeUlQ2J1iBJ5jW8Y0SXHa8Zp4HfK40ETCJwNx8yo6YPT6k7ix46W6VoNxvuRW2CGF15 he/oJ8BSf7HUCKgX60+Tk6ClG1zBwcXb+8lKzGNLgWAANvxLKrFPctMcrL17/Lp/ttQH 4fy/Vy+UDfViUaNgj/I8mDWO8ONrjX1ViUV5EKmNHFd3PPjDPU6DZvSGW4tqU+h+VAca vDvmfCQzgn/S45Ws+XOxcsCvsRwAYcRho1UZ29FZ5ZbPr95lOO3Jq0OTG0JED+NZvXP9 540w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JIWxc1wI7Cpfncnb3m4/WoPWVzgpv9LFDuady0MtgkI=; b=ZPmV+Dgh9jAhgiye3a6CQlp/L8r/xlh+Z/AYiwyxI+BrcdfdddKfPyIBaWYQOoVp2f jclelRkkaY7gBiP+hatnI2l9VvZK4vZ/cm0jATt7iOpu/l4Zgr/e9c8Zy+AXjgkKGkyT vHKHqTtGW3tX33yVbE1z1+5rgBlwpU3H/BrU2dvlNKGTXjQI5l7vByytFIMMVMetqW88 YPF6aXCx3tjuowkeGCv7Tuzxk/GIOCahBNBgabKgZKcTgqmlS9rYTvSIRWsQntrtNWvn kegpnSXos8uqMC77bvcUW8IyC2wUEKdd+EEkX0xeGiDr0b/NK5jHN6QrHwg83G6a/DJT sNLQ== X-Gm-Message-State: AODbwcC300iVhtCKI80DXtCnA5k2U71yqHm1j1HohhzRXSb0aQGKp87N lPiYV98Ghbmrpw== X-Received: by 10.223.135.153 with SMTP id b25mr3879019wrb.48.1497174776201; Sun, 11 Jun 2017 02:52:56 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3D2E004C1F3DE25BB39BC3B.dip0.t-ipconnect.de. [2003:dc:d3d2:e004:c1f3:de25:bb39:bc3b]) by smtp.googlemail.com with ESMTPSA id p78sm2871714wmg.5.2017.06.11.02.52.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Jun 2017 02:52:55 -0700 (PDT) From: Martin Blumenstingl To: wim@iguana.be, linux@roeck-us.net, robh+dt@kernel.org, carlo@caione.org, khilman@baylibre.com, linux-watchdog@vger.kernel.org, linux-amlogic@lists.infradead.org Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Martin Blumenstingl Subject: [PATCH] watchdog: meson-wdt: add support for the watchdog on Meson8 and Meson8m2 Date: Sun, 11 Jun 2017 11:52:19 +0200 Message-Id: <20170611095219.22095-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.13.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The watchdog IP block on Meson8 and Meson8m2 is already supported by the existing meson-wdt driver. Meson8 uses the same register bits as Meson6, while the newer Meson8m2 SoC uses the same register bits as Meson8b. Currently watchdog support on Meson8 SoC already works because meson8.dtsi simply uses the "amlogic,meson6-wdt" compatible. Adding a separate compatible for Meson8 makes this more explicit though. Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong Reviewed-by: Guenter Roeck --- Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 6 +++++- drivers/watchdog/meson_wdt.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt index ae70185d96e6..f2fbe1a39d31 100644 --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt @@ -2,7 +2,11 @@ Meson SoCs Watchdog timer Required properties: -- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt" +- compatible : depending on the SoC this should be one of: + "amlogic,meson6-wdt" + "amlogic,meson8-wdt" + "amlogic,meson8b-wdt" + "amlogic,meson8m2-wdt" - reg : Specifies base physical address and size of the registers. Example: diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 491b9bf13d84..304274c67735 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -155,7 +155,9 @@ 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,meson8-wdt", .data = &meson6_wdt_data }, { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data }, + { .compatible = "amlogic,meson8m2-wdt", .data = &meson8b_wdt_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);