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: 42939 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A59CA2055F for ; Sat, 10 Jan 2015 21:14:31 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id q1sf10467809lam.2 for ; Sat, 10 Jan 2015 13:14:30 -0800 (PST) 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=SdxS55turfVodtS+637SI71v7fZYQmY0Wf5AYRwP13E=; b=PDosgGPaT0bTlMSkg1veWgCT44peskg/ClKWSA2Gtc06m0lO2eoxJe1R+G8aQxiLE3 8nQedC3Sr0+IkCzjWc1H1MyZ71O+XzO8ywZSsRrENA/4NgrOyW2xjykfMgswnuYPfGFc gPZyszV0mazdVgwJfqNP78Joqe24AembKjaEZlpQiPYdSKI8EeihmJJCESDezKKvURb8 WJ6J/H7/vwxIO/uK98/CpowtNB3aKcHyIZ3vtq3fkZYk5o0lPlq+9YpnO5rw9vQ4OUih 3DukD8ReIJUIQeDpKM0sXTYIMb/gRtvIKktWtJEwm2TDw0XozaDV78FoK5fG6QpBXBpS I95A== X-Gm-Message-State: ALoCoQlQjp5+ctl05wHsBUFyxnLfXfR2Y3Ah89tejwhciOVeM8VYshbPXDQXG5ZaclxsiT80UQNK X-Received: by 10.180.105.97 with SMTP id gl1mr1197983wib.7.1420924470508; Sat, 10 Jan 2015 13:14:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.136 with SMTP id kq8ls517501lac.84.gmail; Sat, 10 Jan 2015 13:14:30 -0800 (PST) X-Received: by 10.112.147.10 with SMTP id tg10mr29017097lbb.92.1420924470315; Sat, 10 Jan 2015 13:14:30 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id w6si17260768laa.37.2015.01.10.13.14.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 10 Jan 2015 13:14:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id gd6so19337725lab.3 for ; Sat, 10 Jan 2015 13:14:30 -0800 (PST) X-Received: by 10.112.159.136 with SMTP id xc8mr28763211lbb.98.1420924469838; Sat, 10 Jan 2015 13:14:29 -0800 (PST) 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.9.200 with SMTP id c8csp694588lbb; Sat, 10 Jan 2015 13:14:28 -0800 (PST) X-Received: by 10.68.182.1 with SMTP id ea1mr33502161pbc.11.1420924467950; Sat, 10 Jan 2015 13:14:27 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bl9si18575075pdb.47.2015.01.10.13.14.27; Sat, 10 Jan 2015 13:14:27 -0800 (PST) Received-SPF: none (google.com: linux-kernel-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 S1754776AbbAJVOY (ORCPT + 27 others); Sat, 10 Jan 2015 16:14:24 -0500 Received: from mail-lb0-f182.google.com ([209.85.217.182]:34325 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683AbbAJVOX (ORCPT ); Sat, 10 Jan 2015 16:14:23 -0500 Received: by mail-lb0-f182.google.com with SMTP id u10so12777728lbd.13 for ; Sat, 10 Jan 2015 13:14:21 -0800 (PST) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.44 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: , 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>; }; };