From patchwork Tue Sep 27 14:50:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jeffery X-Patchwork-Id: 9352077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E86F86077B for ; Tue, 27 Sep 2016 14:55:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D60E828E0F for ; Tue, 27 Sep 2016 14:55:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5FDE28FF3; Tue, 27 Sep 2016 14:55:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5077428E0F for ; Tue, 27 Sep 2016 14:55:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1botm4-0004a4-M6; Tue, 27 Sep 2016 14:54:24 +0000 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1botkA-00035h-ML for linux-arm-kernel@lists.infradead.org; Tue, 27 Sep 2016 14:52:27 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D6C8420813; Tue, 27 Sep 2016 10:52:07 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Tue, 27 Sep 2016 10:52:07 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=aj.id.au; h=cc :date:from:in-reply-to:in-reply-to:message-id:references :references:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=/GGKV LbX5qfBNUyLhrcOSR5DuJA=; b=eL9VJ44mW1y56/og3BuCr665TOGE8W09m1B7G T1SgHFvBWmVety0g9dWiFLFejL/G8MyPcBPi/EznFGHBBU3AlWdVzQHnDCYWfcdw e3iJo6rjwblajZpw8WKGnIT603sYsQ4M8B7j/8I3Rpq66tpe76Na7e4gGUEnGQyF 0ym4uI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:in-reply-to :message-id:references:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=/GGKVLbX5qfBNUyLhrcOSR5DuJA=; b=CdnRC pAV+NFedU4J7Oc0vfjd7dBKlPDnbB9smtPhrkpdxkTFQ0PoVwSx9Dl/5Za/Xjtsh o3HLlJk/uBCL9o8eaxzSBq3goZn5YeGqnti2KGFFzMipo9S+hxGhkjQa1MX0chR8 BpG5HOdme2wX/7fCLEADaO6vbzDmJveM0YRA2A= X-Sasl-enc: uGfJavDNHpDCl0JNf+Qm93n7GCN2hg4RyL52bejrHh1U 1474987926 Received: from keelia.au.ibm.com (ppp203-122-213-247.static.internode.on.net [203.122.213.247]) by mail.messagingengine.com (Postfix) with ESMTPA id E1818F29CC; Tue, 27 Sep 2016 10:52:03 -0400 (EDT) From: Andrew Jeffery To: Linus Walleij Subject: [PATCH 6/8] pinctrl: aspeed-g4: Capture SuperIO pinmux dependency Date: Wed, 28 Sep 2016 00:20:18 +0930 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160927_075226_938966_296A932D X-CRM114-Status: UNSURE ( 8.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Andrew Jeffery , openbmc@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Rob Herring , Joel Stanley , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Two LPC-related signals in the AST2400 depend on state in the SuperIO IP block. Use the recently added infrastructure to capture this relationship. Signed-off-by: Andrew Jeffery --- drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 4 ++-- drivers/pinctrl/aspeed/pinctrl-aspeed.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c index a21b071ff290..ceb13d4955cb 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c @@ -82,8 +82,8 @@ FUNC_GROUP_DECL(MDIO2, A3, D5); #define H19 13 #define H19_DESC SIG_DESC_SET(SCU80, 13) -SIG_EXPR_LIST_DECL_SINGLE(LPCPD, LPCPD, H19_DESC); -SIG_EXPR_LIST_DECL_SINGLE(LPCSMI, LPCSMI, H19_DESC); +SIG_EXPR_LIST_DECL_SINGLE(LPCPD, LPCPD, H19_DESC, SIG_DESC_BIT(SIORD30, 1, 0)); +SIG_EXPR_LIST_DECL_SINGLE(LPCSMI, LPCSMI, H19_DESC, SIG_DESC_SET(SIORD30, 1)); MS_PIN_DECL(H19, GPIOB5, LPCPD, LPCSMI); FUNC_GROUP_DECL(LPCPD, H19); diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h index 4384407d77fb..3a76d2c95584 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h @@ -266,6 +266,8 @@ #define SCUA8 0xA8 /* Multi-function Pin Control #9 */ #define HW_STRAP2 0xD0 /* Strapping */ +#define SIORD30 SIG_DESC_TO_REG(ASPEED_IP_SIO, 0x30) + /** * A signal descriptor, which describes the register, bits and the * enable/disable values that should be compared or written.