From patchwork Tue Sep 30 07:15:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 394792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43A141400D5 for ; Tue, 30 Sep 2014 17:15:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753963AbaI3HPd (ORCPT ); Tue, 30 Sep 2014 03:15:33 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:60996 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751591AbaI3HPd (ORCPT ); Tue, 30 Sep 2014 03:15:33 -0400 Received: by mail-wi0-f178.google.com with SMTP id ho1so3660114wib.17 for ; Tue, 30 Sep 2014 00:15:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tAH74voJtCLpHgCvaw1MfSqDVrFe68OH9iB+GxGR+30=; b=hwsDsgeYEAFZJzb2pO22s8ymkIIy8TaNNGQz/y+8oepGROL93YPQ0Gyeic5jZr2rKG ikUFI3o4J0bUpr8FVAMwFwfSV5OAGTI3uIgcfxlfvp+X42fLbxcmyUgH8nuvz9iVXGLS QEGmboWzLl2GMb/mIeZfkyQJxl6cy1jY0urKETbHXuBS0ynYBnRI42kH2GDdOQlL3i7x gAxF4QzSi2eo6lBj8ObeacKfQY7IvZEexaVaE2kO7g4oimhA0zTEvJuIV259rDr6C2na NAEmCN7NrrQZhGbjDujD82nxvsWg3xars3DkIIuN2FDKWPhDdHn4/MH/scCbANP5onRI r7hg== X-Gm-Message-State: ALoCoQkSHMZuRWJH8QAxbXdDzAuzJQGhE/VxwxtiVHSOY/+7ZiyBiOq6EsJvV2OI8r2b3ifoNaSh X-Received: by 10.180.20.73 with SMTP id l9mr3348490wie.17.1412061331722; Tue, 30 Sep 2014 00:15:31 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id lg6sm18158636wjb.40.2014.09.30.00.15.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Sep 2014 00:15:30 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH] pinctrl: alter device tree bindings for functions Date: Tue, 30 Sep 2014 09:15:28 +0200 Message-Id: <1412061328-20966-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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.