From patchwork Wed Jun 14 12:39:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 105514 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp273332qgd; Wed, 14 Jun 2017 05:45:58 -0700 (PDT) X-Received: by 10.98.59.92 with SMTP id i89mr443914pfa.122.1497444358715; Wed, 14 Jun 2017 05:45:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497444358; cv=none; d=google.com; s=arc-20160816; b=AjquC8Si/8DLAkFt0JlKGWOTs2l7PEyG29Rz23jTGdJZ3mInZHCOkDACosAukclfrr cThvA077gX+/uUknhYEdXQhpVX+esX6WiVnwHBKdvbEMxikiNHvzkc5CQhES2S4AYsL+ yR/zGWhRKRLrQwoVTTMytP6M/nTJ3V6ynEUf2sp/jRG/w5LVZWa7fj66zXuY1RwWHVXR dr8j3Ik0/LfC2xZk39FkvivrzLrVE7IMu853U3e/vbQQ15nru5ExqR8F/er78lCKB+NC UhOZxJEmfZL2XRpYFC0sub5kY3vscS+RBvA0hkQdB2cBaHcDY2V5HB63cN6Gj4mxC3a8 JBaw== 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=EMWfj+zc8yvxTO8bOruXEzQzOIUzdGwn9o3wAn7fIhU=; b=KpmEmaxh/VUwAe3erVA5tfLmZPmMB5t0lS2IUK0vVWz9hCkknjxELSGK5zN0hon1n2 2mvt1vgtjYp7Of1qSaFVGbrdphdQKh1NucQgNLefmsQkSSgjtl4Q0ZfhpHsGnO3a0bxS C8UPET29TW8PDnn/0bLFA4eXKgJZiIGJd8YoecQHHAb991fO/FzLMXHVR+hM0Ep0TPkX g5o3uIkrGXrPo4G4zOM1WTeNHy40XjYzOwBhBIRidMT+FtObtyN2hgwYJe/kF/pYIq9w 2FS9cG6Dq6tJrXp1RM9vM9TC2wuxWf1cZrpAud9N9jeGlnUPHtkTwr3k16fbUej8h2WQ HUjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=dEjs7uw4; 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 h7si445574pgc.123.2017.06.14.05.45.58; Wed, 14 Jun 2017 05:45:58 -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 header.b=dEjs7uw4; 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 S1752600AbdFNMpj (ORCPT + 25 others); Wed, 14 Jun 2017 08:45:39 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:36163 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbdFNMlF (ORCPT ); Wed, 14 Jun 2017 08:41:05 -0400 Received: by mail-wr0-f172.google.com with SMTP id 36so66267225wry.3 for ; Wed, 14 Jun 2017 05:41:04 -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=EMWfj+zc8yvxTO8bOruXEzQzOIUzdGwn9o3wAn7fIhU=; b=dEjs7uw4qi2sv3xVskk0kkP7EELGQMMsN55KPrMNsyJqKzSTUhVR06IW8zYo8Xvyqm TKtaG4eYPt3XtSk/nWHBCYcr+uAqmnUJraiqrSoqwsoCqX1jp2DQYy9vLQVh6NZPytID WD2TIX6zpkwyc9bzjSSd1Wu5fboGjPElpGkjY= 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=EMWfj+zc8yvxTO8bOruXEzQzOIUzdGwn9o3wAn7fIhU=; b=iAbCLdkmnGP8SDEPojyUBu2hTQ48RcTlSSL0CjFyJr31sx4uyBmPBhgIbN+MWAohil vjdZI52zbff9Ht7iPm+OgCljbbLwdlT21xQ0W4vLDISp4QADNXj2qVSF4SDkAycZJAhP 62jMdv1jxpUQfyvOXO3LvPPDAENVH/4BCNWUljqeRe+jFeZmkMdgNVCF06BBJ8EtnR9T Y0xe/FfChEYwwhRUmFjI8dt/7w/vpQ27CL0S1+js+ebud0M8uyfEp30PreN/aA0NOoFL ekXJOvWQpcFxf6PnBQJEk58J7qACN/CgL+IvgyWn0TirQlad8pR8/+Ch+D/b4Vn5Ihlb vCgw== X-Gm-Message-State: AKS2vOy9nxTwg4/TN/v3t1HEtIn/q85szRiDcuxvk/PC1akKuJetFvrU MuYxyGovnij0kzHl X-Received: by 10.28.109.220 with SMTP id b89mr927045wmi.97.1497444058860; Wed, 14 Jun 2017 05:40:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:19a:b336:54d7:46e9]) by smtp.gmail.com with ESMTPSA id 80sm1457015wmg.17.2017.06.14.05.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 05:40:58 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Linus Walleij , Joel Stanley , Rob Herring , Jonas Jensen , Rob Herring , Mark Rutland , Andrew Jeffery , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...) Subject: [PATCH 03/23] clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings Date: Wed, 14 Jun 2017 14:39:24 +0200 Message-Id: <1497443984-12371-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497443984-12371-1-git-send-email-daniel.lezcano@linaro.org> References: <20170614123800.GH2261@mai> <1497443984-12371-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Walleij 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 Acked-by: Rob Herring Acked-by: Joel Stanley Signed-off-by: Daniel Lezcano --- .../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.7.4 diff --git a/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt b/Documentation/devicetree/bindings/timer/faraday,fttmr010.txt index b73ca6c..6e18bd6 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 e207c11..0000000 --- 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>; - };