From patchwork Wed May 17 14:05:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 99975 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp229759obb; Wed, 17 May 2017 07:06:40 -0700 (PDT) X-Received: by 10.98.67.8 with SMTP id q8mr3939061pfa.67.1495030000139; Wed, 17 May 2017 07:06:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495030000; cv=none; d=google.com; s=arc-20160816; b=q3gg1EB8inFHm4sgrS8WtmqVsJIplDGmkbLTGrJut1UnwOQ0JVg/SFM6fThXnjKIIf WFP/jaPFmIuRqsGP4WFl5BVxh3CGFFJytwp2lw23HxLIIbwkr5d6wiDOW+USgWAYJRiO nL6/P+/corn2355bCBeVmDX9S02BkVYgA3igee/mWw24H5terKWZwhePrH/3rAoKVXqw FfAB9oli9nDwGgPHnwA3SZwf3QdQr7eCOrE30TOXAohveLgaKBVjatdqOdDduraF0eFk 3o1UoLVBIFk9FeCkKANrya3nJ/85aqSfUj04s6HeiPmGZ2B3G7Bfa1YmZYmEKOqMrf8v 57fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=twFKuUmL8t4kCzB7QcQn+y8R41CaTBcccgX4a4JwoP0=; b=x6S4AzfCqjD6KI2lDW8pDnNOQr4ss9OXZ338tPEf8Lauvk48J0mTDiscyMRc9oBRjg Dr7yMMc7rB9vrwDS1ohNx/8w93KvmxuktPNc+gvu7fROyQ+FHMkmBEseq5DdRf9iLUvV AniKmpw5DkJ3YY5BkGdUAzaT6K8h3TAX71ylSZ1ELqOpJPcaVY56wI/ErdFAkVZJ7v7l XFoFaSW2yh2sEUT8dnmq1FYmQ1558FhMlMwpUtmJebY4XC8o2iM7jIq1pLF5UPJtcOYY RjPOsZgvpv5vGjmxNJvfEDY8KBtNNldPUA8c1nDE7oA6PusAMw0vfODDJoiicPMLuu1L b94A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 x16si2196184pge.318.2017.05.17.07.06.39; Wed, 17 May 2017 07:06:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1754546AbdEQOGh (ORCPT + 7 others); Wed, 17 May 2017 10:06:37 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:33257 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753990AbdEQOGd (ORCPT ); Wed, 17 May 2017 10:06:33 -0400 Received: by mail-wr0-f173.google.com with SMTP id w50so10967881wrc.0 for ; Wed, 17 May 2017 07:06:33 -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:in-reply-to:references; bh=OcCV52I59GjvZydZngDbd3ZyKJLYIxY96HpbhSfSBck=; b=Z0gFf8Taq5r2SCw9x8FVk1St6Ms3pC0NLIEY5u4LLclhfbXUE3Ly8DC/4ZgyDG2Luw DOi50/ZEfDcqedgBSJuT5t/33Zi4MVR3YsgL2vCfcBS1zPu9K389rkARxj8pM5xHCRE5 KLmiaI2xjirgHvpVeXp527N6ieDVsifInsh8g= 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:in-reply-to :references; bh=OcCV52I59GjvZydZngDbd3ZyKJLYIxY96HpbhSfSBck=; b=U62SMeUz0OtfW5YTJ/zE/i7byQVda3USCQhKg7W+l1q9Gv95OxShOrnA+7J/QGUb65 jF8D+3Eg892nrRZW8zi3NEo0AlJiNnczHPRJ6vUwcZLfLADW+rXDiiUHamn/4XpDmYbz ENMVPK9BctxMu7QZZnhcVikuWk3CWBQ+hcqOClChm0oCgSjo/QaXekatNGt/UBpWmoox /nLUF4WGRYwiWN1ebHsCfaR8Hgsu7ssUFAn+6KNPGYKzis+bJCvjGvuw7a3znP6S9NU5 hAVNRrKinVninSEtmXtK22dB0HS761Xd8K2pCYSlaFf0WKATIvSJ4OShewgIzHYmhoug jr4Q== X-Gm-Message-State: AODbwcAUmwWCRSx9+vJXy2f9zBIPaeE88tXim5SPSoZzoBYXoDfPaubc SND5gh82rJXL2ubk X-Received: by 10.46.78.26 with SMTP id c26mr984798ljb.48.1495029992273; Wed, 17 May 2017 07:06:32 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-3c94db54.014-348-6c756e10.cust.bredbandsbolaget.se. [84.219.148.60]) by smtp.gmail.com with ESMTPSA id 139sm409680ljj.16.2017.05.17.07.06.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 07:06:29 -0700 (PDT) From: Linus Walleij To: Daniel Lezcano , Thomas Gleixner , Joel Stanley , Jonas Jensen Cc: Janos Laube , Paulius Zaleckas , linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli , linux-kernel@vger.kernel.org, Linus Walleij , devicetree@vger.kernel.org, Rob Herring Subject: [PATCH 2/8] clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings Date: Wed, 17 May 2017 16:05:36 +0200 Message-Id: <20170517140542.20016-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170517140542.20016-1-linus.walleij@linaro.org> References: <20170517140542.20016-1-linus.walleij@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This merges the Moxa and FTTMR010 device tree bindings into the Faraday binding document to avoid confusion. The FTTMR010 is the IP block used by these SoCs, in vanilla or modified variant. The Aspeed variant is modified such that it is no longer fully register-compatible with FTTMR010 so for this reason it is not listed with two compatible strings, instead just one. Cc: devicetree@vger.kernel.org Cc: Rob Herring Cc: Joel Stanley Cc: Jonas Jensen Signed-off-by: Linus Walleij --- .../devicetree/bindings/timer/faraday,fttmr010.txt | 4 +++- .../devicetree/bindings/timer/moxa,moxart-timer.txt | 19 ------------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt index b73ca6cd07f8..6e18bd662ccb 100644 --- a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt +++ b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt @@ -7,7 +7,9 @@ Required properties: - compatible : Must be one of "faraday,fttmr010" - "cortina,gemini-timer" + "cortina,gemini-timer", "faraday,fttmr010" + "moxa,moxart-timer", "faraday,fttmr010" + "aspeed,ast2400-timer" - reg : Should contain registers location and length - interrupts : Should contain the three timer interrupts usually with flags for falling edge diff --git a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt deleted file mode 100644 index e207c11630af..000000000000 --- a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt +++ /dev/null @@ -1,19 +0,0 @@ -MOXA ART timer - -Required properties: - -- compatible : Must be one of: - - "moxa,moxart-timer" - - "aspeed,ast2400-timer" -- reg : Should contain registers location and length -- interrupts : Should contain the timer interrupt number -- clocks : Should contain phandle for the clock that drives the counter - -Example: - - timer: timer@98400000 { - compatible = "moxa,moxart-timer"; - reg = <0x98400000 0x42>; - interrupts = <19 1>; - clocks = <&coreclk>; - };