From patchwork Thu May 18 20:16:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 100129 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp6536qge; Thu, 18 May 2017 13:18:59 -0700 (PDT) X-Received: by 10.98.15.23 with SMTP id x23mr6405305pfi.86.1495138739879; Thu, 18 May 2017 13:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495138739; cv=none; d=google.com; s=arc-20160816; b=c1cCgwFxsOjjZTaFqfyDIZemslNQwZvF1/4SBxE74BPeQGdNN9OdB9w27tt2wop0q4 +y8bhP/7DUhsEGpbNk6Ydn1ccoxLkxT6cSHYGdAN7WGBDv+oU5hY7WLfZjxa2fScQvZg I2L7KHwhFsW/KQym7Ju+sSsFii+8GoRaBegyZK+jMQOEDaqGAif5Bb4nQ1YPXbzUMgXT HY2ygga2dcW2MukvWWM9axb9OOorfW1H17emlASY/AypnG6DTrDSgCsxMQsr/Y/QnBLQ 4gio+UUgzH5iR/slw1lIjic9DqvNhdF5tWr6Ao9VA+h1NGLF3VV5vnpp4wYjJ8CnDGAP bbWg== 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=tG9DOdKRY1pJTUGw5gRVv8L8Y05mXzxF0/G8uunOEOs=; b=LnrP/tv446qfzd6btsuqMoLO338At7KBPlLr3Dd0eyhuEm8LPAwGm8lr7dzSzcS5zy jwo4yeFI3cyGumNIXtj2VcWSlson87rz2aB/Adn9hE6awcqyGMUDR+W5MnebHuqH4xJk IsU4GqaN/Sb9xWQo7RjAkdmWY+dkKnDBThJDhIgI68tnMvo2hVB2687HyIMPIddnzMdZ E08S62GfIDzBBi5ommQh9VcKriSUcbtEDP8x30TTzPfBDs+h/hA5KqatWIG9VWqRhzyo YCejKYIfizWCsxdNLoV7NZe8BBrFmsFpwjokVwytRZQyGD4im0LeqZkv0RNml7+VeDkR 7q5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 b8si4984374ple.2.2017.05.18.13.18.58; Thu, 18 May 2017 13:18:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755709AbdERUR0 (ORCPT + 25 others); Thu, 18 May 2017 16:17:26 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:38174 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995AbdERURX (ORCPT ); Thu, 18 May 2017 16:17:23 -0400 Received: by mail-wm0-f49.google.com with SMTP id v15so65045787wmv.1 for ; Thu, 18 May 2017 13:17:23 -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=tG9DOdKRY1pJTUGw5gRVv8L8Y05mXzxF0/G8uunOEOs=; b=ch2A0sXzWYTL+asK8keGFgo6ZxExlvFvKce7IwV+8kstjAqARfUhmxaifr8IMOwSbN LIIXm35GmmMjnijUTk5Hl3OYUKOxxbKaSEaS09uQIHXqeLXQNUY9H7PDzzjiPvsunXcb SDjX+4rzA6h7UFnRpY/vyvBAJA7AnLZ8dnraU= 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=tG9DOdKRY1pJTUGw5gRVv8L8Y05mXzxF0/G8uunOEOs=; b=idYLGZdDApdNaBnBu+joZsy9CYdmdXOKkDQTXXUk+OFPHjtYVy3leanm4DM/PbC7fP Jy4Sr+ablYzZzy4RoxVdr00x4qHeSkRM2BspEeEYA0Kyn8Mu7yauonCFR6jpt6flFk0e gp1gZON44PS3O98Jt2bNRxg/AcX/kR3R5imP3AiKYhyv8wv5wuQTtjzww2xGoIzsCQY/ kGMfWY8kIHL6HDDJ+WqtrgnCxqoAKt6ZQlExnX9CXpRTcpErBPyKUQCRoyue5rCuwmjH FQVuNGiXLtXeNqFJ2wt5lqGnbpPbgbnm3Vp5OIdekiJcNU4zTV2fU6E959q8DO28PUid MVIA== X-Gm-Message-State: AODbwcC+GJ44K+RXEHBS8cu7YEnDbkGNMNlDsjjU/9Fojk1lMYpWL7kP Ahc9BtROOZIF+eQn X-Received: by 10.25.77.149 with SMTP id a143mr1280613lfb.121.1495138642310; Thu, 18 May 2017 13:17:22 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-787571d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.117.120]) by smtp.gmail.com with ESMTPSA id y1sm1103615lja.24.2017.05.18.13.17.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 May 2017 13:17:20 -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 Subject: [PATCH 2/8 v2] clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings Date: Thu, 18 May 2017 22:16:59 +0200 Message-Id: <20170518201705.28790-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170518201705.28790-1-linus.walleij@linaro.org> References: <20170518201705.28790-1-linus.walleij@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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: Joel Stanley Tested-by: Jonas Jensen Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Added Jonas' Tested-by, no functional changes. --- .../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 Acked-by: Joel Stanley 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>; - };