From patchwork Thu Oct 2 07:43:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 38268 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E9AE20BF9 for ; Thu, 2 Oct 2014 07:44:03 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf810636lbv.4 for ; Thu, 02 Oct 2014 00:44:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=XRNIp8ok2ARAPzU9MJMCK6gMl+p4DV4tm3+3rNPix6E=; b=dBVCT9NxBGgB4FRQ/ApK1DOKwZIhrlKZn4+9Uwi1mv2sa2z+WwLD2XPPiffXSrCB3g ZXK17Uh/a59oDLuQqdTlLStNRMURDidqgRE1qhICLpYIRvsizXXMsyeEMVMDw1Q7EBxc qpQsmiP8YJFS6PHQKLMcFMu0E0/8etZ3tmIZo0vdyF/ZYZEtX8I7ap3b0xnOhNUy+KHZ w9as+63ZkVGo4iqrxd+9l7/ViwHEp5drCD1lx5l2K0jxlVjkTn3IdFiWy22uz15i2I4u rlDANdPvUDHBmgqYfQhWiTF1ZCU0mTQqZq0EgQ34wV0ZpwMMLlfcyUrOgZAQ2Kh7MqrW ldSA== X-Gm-Message-State: ALoCoQnxDhDaCMfx8g36Ji+Qp3ty8c+kpE3KdMuVPUCESV9H3yXggbpnnlbU3OsnJu952UbnH4ck X-Received: by 10.152.42.229 with SMTP id r5mr540194lal.8.1412235842376; Thu, 02 Oct 2014 00:44:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.161.234 with SMTP id xv10ls250908lab.13.gmail; Thu, 02 Oct 2014 00:44:02 -0700 (PDT) X-Received: by 10.112.14.199 with SMTP id r7mr57714869lbc.58.1412235842145; Thu, 02 Oct 2014 00:44:02 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id wz5si5269309lbb.59.2014.10.02.00.44.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Oct 2014 00:44:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id mc6so1837320lab.30 for ; Thu, 02 Oct 2014 00:44:01 -0700 (PDT) X-Received: by 10.112.163.103 with SMTP id yh7mr57549327lbb.73.1412235841728; Thu, 02 Oct 2014 00:44:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp10901lbb; Thu, 2 Oct 2014 00:44:01 -0700 (PDT) X-Received: by 10.68.238.196 with SMTP id vm4mr83843149pbc.45.1412235840192; Thu, 02 Oct 2014 00:44:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pa3si3166125pbc.59.2014.10.02.00.43.59 for ; Thu, 02 Oct 2014 00:44:00 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751666AbaJBHn6 (ORCPT + 5 others); Thu, 2 Oct 2014 03:43:58 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:55942 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751662AbaJBHn6 (ORCPT ); Thu, 2 Oct 2014 03:43:58 -0400 Received: by mail-wg0-f47.google.com with SMTP id x13so2395176wgg.18 for ; Thu, 02 Oct 2014 00:43:57 -0700 (PDT) X-Received: by 10.181.27.132 with SMTP id jg4mr1838154wid.82.1412235837043; Thu, 02 Oct 2014 00:43:57 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u2sm3657066wjz.11.2014.10.02.00.43.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Oct 2014 00:43:56 -0700 (PDT) From: Linus Walleij To: devicetree@vger.kernel.org, Grant Likely , Rob Herring Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij Subject: [PATCH] pinctrl: alter device tree bindings for functions Date: Thu, 2 Oct 2014 09:43:52 +0200 Message-Id: <1412235832-19360-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , For function and group configuration nodes, use "function" "groups" string pairs, not "pins" where there should be "groups". Signed-off-by: Linus Walleij --- .../bindings/pinctrl/pinctrl-bindings.txt | 39 ++++++++++++++++------ 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt index fa40a177164c..4f5a0c3af8b9 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt @@ -127,6 +127,24 @@ whether there is any interaction between the child and intermediate parent nodes, is again defined entirely by the binding for the individual pin controller device. +== Generic pin multiplexing node content == + +pin multiplexing nodes: + +function - the mux function to select +groups - the list of groups to select with this function + +Example: + +state_0_node_a { + function = "uart0"; + groups = "u0rxtx", "u0rtscts"; +}; +state_1_node_a { + function = "spi0"; + groups = "spi0pins"; +}; + == Generic pin configuration node content == Many data items that are represented in a pin configuration node are common @@ -140,7 +158,6 @@ Supported generic properties are: pins - the list of pins that properties in the node apply to -function - the mux function to select bias-disable - disable any pin bias bias-high-impedance - high impedance mode ("third-state", "floating") bias-bus-hold - latch weakly @@ -163,6 +180,17 @@ output-low - set the pin to output mode with low level output-high - set the pin to output mode with high level slew-rate - set the slew rate +For example: + +state_0_node_a { + pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */ + bias-pull-up; +}; +state_1_node_a { + pins = "GPIO1_AJ3", "GPIO3_AH3"; /* RTS+TXD */ + output-high; +}; + Some of the generic properties take arguments. For those that do, the arguments are described below. @@ -170,15 +198,6 @@ arguments are described below. binding for the hardware defines: - Whether the entries are integers or strings, and their meaning. -- function takes a list of function names/IDs as a required argument. The - specific binding for the hardware defines: - - Whether the entries are integers or strings, and their meaning. - - Whether only a single entry is allowed (which is applied to all entries - in the pins property), or whether there may alternatively be one entry per - entry in the pins property, in which case the list lengths must match, and - for each list index i, the function at list index i is applied to the pin - at list index i. - - bias-pull-up, -down and -pin-default take as optional argument on hardware supporting it the pull strength in Ohm. bias-disable will disable the pull.