From patchwork Fri Aug 8 22:29:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4701721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F36CD9F373 for ; Fri, 8 Aug 2014 22:31:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E8C920173 for ; Fri, 8 Aug 2014 22:31:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E783E20125 for ; Fri, 8 Aug 2014 22:31:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFsfJ-000079-Pw; Fri, 08 Aug 2014 22:29:37 +0000 Received: from mail-vc0-f201.google.com ([209.85.220.201]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFsfH-00005o-Ld for linux-arm-kernel@lists.infradead.org; Fri, 08 Aug 2014 22:29:36 +0000 Received: by mail-vc0-f201.google.com with SMTP id le20so822338vcb.2 for ; Fri, 08 Aug 2014 15:29:13 -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=DWGmD93AIirnPYx68QtLeM7/x6WTVHjbEnw5nruZ750=; b=ZfFBtJZ6949vd4OC7HdQ7CLH1Vd791ytRVBEx5yTgO7jKVwZCt+tJYEayRMHuz7LjE ZYtdwHUN7DqLr0iI/8a1NEDslztVIqMDpzYGov8QVMbx5cQOenurXofh5RHVA5bDQyz2 EF4ZSOzExHCsbiWhcfYLPw6VuTqMTE3d53gswMfN72H3012R5PuMgk24drUPeXH6X2Du FqZDMv9wmHKeDeBzQg0ORWdVxqNSnJK62ivUoPCBPZGqd8e3PJjyp6oEn8PcEpwcIbM7 ALalUuyQNpFcFjZ7dZ0zaoUlF7gJlqks6eR1qu8FYqLtSd/VDxjoCnKszrUDFi70n/eG NsPw== X-Gm-Message-State: ALoCoQl2OC2wTfeZ5Zbef8LmxvcJKl0oZU0BnP4PM8GfK1mHwj7PhtozN4MBlyKz2ACGJvAZ9G9+ X-Received: by 10.236.4.41 with SMTP id 29mr6237746yhi.25.1407536953503; Fri, 08 Aug 2014 15:29:13 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id l23si559772yhg.1.2014.08.08.15.29.13 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Aug 2014 15:29:13 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 5277431C243; Fri, 8 Aug 2014 15:29:13 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id CF48680957; Fri, 8 Aug 2014 15:29:12 -0700 (PDT) From: Doug Anderson To: Linus Walleij , Heiko Stuebner Subject: [PATCH] pinctrl: Add mux options 3 and 4 for rockchip pinctrl Date: Fri, 8 Aug 2014 15:29:09 -0700 Message-Id: <1407536949-31323-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140808_152935_790764_95F940E5 X-CRM114-Status: GOOD ( 10.21 ) X-Spam-Score: -1.4 (-) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, Doug Anderson , linux-kernel@vger.kernel.org, robh+dt@kernel.org, eddie.cai@rock-chips.com, galak@codeaurora.org, Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Newer Rockchip SoCs have more muxing slots. Add slots 3 and 4 since the rk3288 table goes all the way up to 4. Signed-off-by: Doug Anderson Reviewed-by: Heiko Stuebner --- Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 6 +++--- include/dt-bindings/pinctrl/rockchip.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt index 4658b69..388b213 100644 --- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt @@ -2,8 +2,8 @@ The Rockchip Pinmux Controller, enables the IC to share one PAD to several functional blocks. The sharing is done by -multiplexing the PAD input/output signals. For each PAD there are up to -4 muxing options with option 0 being the use as a GPIO. +multiplexing the PAD input/output signals. For each PAD there are several +muxing options with option 0 being the use as a GPIO. Please refer to pinctrl-bindings.txt in this directory for details of the common pinctrl bindings used by client devices, including the meaning of the @@ -58,7 +58,7 @@ Deprecated properties for gpio sub nodes: Required properties for pin configuration node: - rockchip,pins: 3 integers array, represents a group of pins mux and config setting. The format is rockchip,pins = . - The MUX 0 means gpio and MUX 1 to 3 mean the specific device function. + The MUX 0 means gpio and MUX 1 to N mean the specific device function. The phandle of a node containing the generic pinconfig options to use, as described in pinctrl-bindings.txt in this directory. diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index cd5788b..743e66a 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -28,5 +28,7 @@ #define RK_FUNC_GPIO 0 #define RK_FUNC_1 1 #define RK_FUNC_2 2 +#define RK_FUNC_3 3 +#define RK_FUNC_4 4 #endif