From patchwork Sat Aug 12 18:43:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 109930 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp2442167qge; Sat, 12 Aug 2017 11:43:27 -0700 (PDT) X-Received: by 10.84.232.133 with SMTP id i5mr22515597plk.240.1502563407056; Sat, 12 Aug 2017 11:43:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502563407; cv=none; d=google.com; s=arc-20160816; b=n04nGDVzm722UxE8SVfn2BW3cVyzxOEk5hBjHkfWPyza11akcGLAqTSMReimjPzBOU Fm3/HmXU2wnoHkWxa5CvJ1CiQGXFaptKuq9k1xFQW8V06K24aEg2WNihe9CA9X8exYjR awR9ay9VuY3hic0PRDKx39mKaF/fLd0UJv/dCUvZQsqUqneHk1jXMLxuFSiadWrEwFmM R5aoO6N85xANxfHnxyEgdFd4U7+RKefRv0DotCAv4sLQQXFvest0FdXa7TYW6Xi//PiJ YbJkjvXqeWmCa4kriKlcLKn4W3c+UHiPYMzeM2jRWJfjBS5FQXAZzHGbQVTDwJpSs2bQ ZJ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=xnGCGI1ziMgVJXCbOWrPi6clwfjk72opXBwoSSoMVCc=; b=ng2vZ+KJkmyhkZLbhs1VH/8khatg29vVR6pPxkfFzUQ6cysoei8qXMOGIMSCtN1XQ5 TcEXtjKlbzg1NCHBjRLxHzbOibkatqswXbjnKefK2C81RlvJxqFilqF4x5X/G25IaYay vtjNwmI7D0N0fZlDpS4lTK/tJASpkAo+t5/XzuCDFtAnqAZHVx2ijxft2VBdPkpno2xy 6qQPZ0ZMSdURrVYDECIyFuMZTIGsMuDvhEBuKvTyL2hNsoKFaep61UlOIllSDHFDHe++ qKYxul/okf+GIsIHQNPtoddnCkn+rbAI+yRhOgD3JPjJNsjRL/JFbYaZW83ZNz3LJbRe QZ1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RfOrR297; spf=pass (google.com: best guess record for domain of linux-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-watchdog-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q198si2051057pfq.531.2017.08.12.11.43.26 for ; Sat, 12 Aug 2017 11:43:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RfOrR297; spf=pass (google.com: best guess record for domain of linux-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-watchdog-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750973AbdHLSn0 (ORCPT ); Sat, 12 Aug 2017 14:43:26 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:34566 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbdHLSn0 (ORCPT ); Sat, 12 Aug 2017 14:43:26 -0400 Received: by mail-lf0-f47.google.com with SMTP id g25so26977197lfh.1 for ; Sat, 12 Aug 2017 11:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=sHrUaNM+VtIL7mNdp14rJ16V46ZZzHKd0x4GOCbwpUM=; b=RfOrR297qDrW8pK4srvoi9IHflxToGAriqitqP5Nm6q4UKlTaXPRup+zawvPJxwwVs EhLxXaJ2XsxhOGgdmZMa9X62We37aY2Z4x/j1iTOnhd5N5RPxx9+hVkCfhiaOS7vaOK6 qwFZUwoIk5RhfgC70Z0ccrDIfdEQ4sYKB+N+Q= 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=sHrUaNM+VtIL7mNdp14rJ16V46ZZzHKd0x4GOCbwpUM=; b=OVRjqH2DOHXT5ceXnVzeTJiAljlr7PifXXtWOFQ/HP8aLU5NavmRfqKag0Kwarew4Y jWGfHOUSc2XXgsJz3tsTZd2BPBrIbCTDiy4Z2WbbKkqIBbXIBuWNoo2pWKCB9zAEjLyo K9U+DdQRGlsNGg5XP57YQCrsqSzeTMsrhVkoyhU8N+omyNBqmUnGpR+v4nd5YoGHWp7X R2F45ZEASBzsqoOBFo9E+x/AIHeoeU0nk5QJCnsA0/tqhAGUP5fKnDIML6lGbFWwclH6 A3zwJoMvX0tCj5+l1y7M22mnr/IVY+QzakUTNkR9Wdyj1PXnUEEB47sBPVbvd3GbOUDz 44QA== X-Gm-Message-State: AHYfb5i3Q27Wrv7KZeww9fAeJtR89eeiRT7rmpdydzuFtaL6wreRtGXl MRqO7cXAPjRHvoxX X-Received: by 10.25.42.139 with SMTP id q11mr8125144lfq.229.1502563404585; Sat, 12 Aug 2017 11:43:24 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-277e71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.126.39]) by smtp.gmail.com with ESMTPSA id d64sm696628lfg.22.2017.08.12.11.43.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Aug 2017 11:43:22 -0700 (PDT) From: Linus Walleij To: Wim Van Sebroeck , Guenter Roeck , Jonas Jensen , Andrew Jeffery , Joel Stanley Cc: linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Linus Walleij Subject: [PATCH 00/11] watchdog: Consolidate FTWDT010 derivatives Date: Sat, 12 Aug 2017 20:43:07 +0200 Message-Id: <20170812184318.10144-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.13.4 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The MOXA ART and Aspeed watchdogs are clearly based on the Faraday Technology FTWDT010 IP block. This series consolidates the drivers into one by extending the Gemini driver to be as generic as possible, renaming it to ftwdt010_wdt and merging the two other drivers into it. As similar approach was used for the FTTMR010 driver in the past. The series ends with two patches that will be applied to the ARM SoC tree to fix up the PCLK annotations, but these are not needed to make the consolidation, patches 1-9 can be applied directly to the watchdog tree to perform the consolidation. Obviously I would like the MOXA ART and Aspeed maintainers to test the series to see that it still works as expected for them afterwards. The patch series is available at: git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git Branch ftwdt010 Linus Walleij (11): watchdog: gemini/ftwdt010: rename DT bindings watchdog: gemini/ftwdt010: rename driver and symbols watchdog: ftwdt010: Make interrupt optional watchdog: ftwdt010: Add clock support watchdog: ftwdt010: Add restart support watchdog: ftwdt010: Extend DT bindings to derivatives watchdog: ftwdt010: Delete surplus bindings watchdog: ftwdt010/moxart: Merge MOXA ART into FTWDT010 watchdog: ftwdt010/aspeed: Merge Aspeed into FTWDT010 ARM: dts: fix PCLK name on Gemini and MOXA ART ARM: dts: Add PCLK to the Aspeed watchdogs .../devicetree/bindings/watchdog/aspeed-wdt.txt | 16 - .../bindings/watchdog/cortina,gemin-watchdog.txt | 17 -- .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 -- .../bindings/watchdog/faraday,ftwdt010.txt | 34 +++ .../bindings/watchdog/moxa,moxart-watchdog.txt | 15 - arch/arm/boot/dts/aspeed-g4.dtsi | 7 +- arch/arm/boot/dts/aspeed-g5.dtsi | 12 +- arch/arm/boot/dts/gemini.dtsi | 3 +- arch/arm/boot/dts/moxart.dtsi | 3 +- drivers/watchdog/Kconfig | 39 +-- drivers/watchdog/Makefile | 4 +- drivers/watchdog/aspeed_wdt.c | 200 ------------ drivers/watchdog/ftwdt010_wdt.c | 338 +++++++++++++++++++++ drivers/watchdog/gemini_wdt.c | 229 -------------- drivers/watchdog/moxart_wdt.c | 178 ----------- 15 files changed, 401 insertions(+), 711 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt create mode 100644 Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt delete mode 100644 drivers/watchdog/aspeed_wdt.c create mode 100644 drivers/watchdog/ftwdt010_wdt.c delete mode 100644 drivers/watchdog/gemini_wdt.c delete mode 100644 drivers/watchdog/moxart_wdt.c -- 2.13.4 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html