From patchwork Sat Jan 10 21:14:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 427416 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 F275F14012F for ; Sun, 11 Jan 2015 08:14:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbbAJVOY (ORCPT ); Sat, 10 Jan 2015 16:14:24 -0500 Received: from mail-la0-f54.google.com ([209.85.215.54]:58467 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751973AbbAJVOX (ORCPT ); Sat, 10 Jan 2015 16:14:23 -0500 Received: by mail-la0-f54.google.com with SMTP id pv20so19222471lab.13 for ; Sat, 10 Jan 2015 13:14:21 -0800 (PST) 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=XE2uUuPtLtXiVCh10nAv5Jcnug+bvptJ/8a77O261e8=; b=cm4uj9VdSix0sVCYMUiOjkBEb7V07l2FZ3ktLL7in8Cy5uJXwvptacoNkm2IUhrl+H 9dQq6gsHyYz9w7SenYraS5tvqsDPixDQaGoNjcL5kKY3nT+CMvgBFMmAptJU8ZTws+nL d/17uNthL65TlqCGErAHjeFHTy77L+SsxcLIhNqc+kdi9nxjvRvtQ+ofVRSgUMc/1jhB wrBUlqobxRsLYWgwUlpOolJ/3VYMNl60BE6fplMeFbsey4k7blThVwTtniu0pAofF5Ls whFnbtyWygrRkSBWLxKXeCRyD+NJuPe4KyCQGb0tdcgszeBvYp9VYL7Q4yVu62GbnDU/ 7WCQ== X-Gm-Message-State: ALoCoQlXeq1KGz9F+si8uNHisvI7fbiwUUK2HOmFesUprvlqyvKQFHl44nCBRtf1WZNomWjl2dtX X-Received: by 10.152.5.132 with SMTP id s4mr28936810las.39.1420924461872; Sat, 10 Jan 2015 13:14:21 -0800 (PST) Received: from localhost.localdomain (s83-179-52-10.cust.tele2.se. [83.179.52.10]) by mx.google.com with ESMTPSA id pn7sm2787576lbb.6.2015.01.10.13.14.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Jan 2015 13:14:20 -0800 (PST) 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: fix up device tree bindings Date: Sat, 10 Jan 2015 22:14:17 +0100 Message-Id: <1420924457-12730-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 After the Nomadik pin controller was force migrated to generic pin control bindings, some leftovers in the documentation need to be cleaned up. The code and device trees are already migrated. Signed-off-by: Linus Walleij --- .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt index 6b33b9f18e88..f63fcb3ed352 100644 --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt @@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration parameters, such as input, output, pull up, pull down... The name of each subnode is not important; all subnodes should be enumerated -and processed purely based on their content. +and processed purely based on their content. The subnodes use the generic +pin multiplexing node layout from the standard pin control bindings +(see pinctrl-bindings.txt): -Required subnode-properties: -- ste,pins : An array of strings. Each string contains the name of a pin or - group. - -Optional subnode-properties: -- ste,function: A string containing the name of the function to mux to the +Required pin multiplexing subnode properties: +- function: A string containing the name of the function to mux to the pin or group. +- groups : An array of strings. Each string contains the name of a pin + group that will be combined with the function to form a multiplexing + set-up. -- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>) +Required pin configuration subnode properties: +- pins: A string array describing the pins affected by the configuration + in the node. +- ste,config: Handle of pin configuration node + (e.g. ste,config = <&slpm_in_wkup_pdis>) - ste,input : <0/1/2> 0: input with no pull @@ -97,32 +102,32 @@ Example board file extract: uart0 { uart0_default_mux: uart0_mux { u0_default_mux { - ste,function = "u0"; - ste,pins = "u0_a_1"; + function = "u0"; + pins = "u0_a_1"; }; }; uart0_default_mode: uart0_default { uart0_default_cfg1 { - ste,pins = "GPIO0", "GPIO2"; + pins = "GPIO0", "GPIO2"; ste,input = <1>; }; uart0_default_cfg2 { - ste,pins = "GPIO1", "GPIO3"; + pins = "GPIO1", "GPIO3"; ste,output = <1>; }; }; uart0_sleep_mode: uart0_sleep { uart0_sleep_cfg1 { - ste,pins = "GPIO0", "GPIO2"; + pins = "GPIO0", "GPIO2"; ste,config = <&slpm_in_wkup_pdis>; }; uart0_sleep_cfg2 { - ste,pins = "GPIO1"; + pins = "GPIO1"; ste,config = <&slpm_out_hi_wkup_pdis>; }; uart0_sleep_cfg3 { - ste,pins = "GPIO3"; + pins = "GPIO3"; ste,config = <&slpm_out_wkup_pdis>; }; };