linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Jeffery <andrew@aj.id.au>
To: linux-gpio@vger.kernel.org
Cc: Johnny Huang <johnny_huang@aspeedtech.com>,
	linus.walleij@linaro.org, robh+dt@kernel.org,
	mark.rutland@arm.com, joel@jms.id.au,
	linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, ryanchen.aspeed@gmail.com
Subject: [PATCH 6/7] pinctrl: aspeed-g6: Fix UART13 group pinmux
Date: Tue,  8 Oct 2019 15:11:52 +1030	[thread overview]
Message-ID: <20191008044153.12734-7-andrew@aj.id.au> (raw)
In-Reply-To: <20191008044153.12734-1-andrew@aj.id.au>

From: Johnny Huang <johnny_huang@aspeedtech.com>

When UART13G1 is set the pinmux configuration in SCU4B8 for UART13G0
should be cleared.

Fixes: 58dc52ad00a0 ("pinctrl: aspeed: Add AST2600 pinmux support")
Signed-off-by: Johnny Huang <johnny_huang@aspeedtech.com>
[AJ: Tweak commit message]
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
index 68b066594461..dc17cf3d3549 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
@@ -1262,13 +1262,13 @@ GROUP_DECL(SPI1, AB11, AC11, AA11);
 #define AD11 206
 SIG_EXPR_LIST_DECL_SEMG(AD11, SPI1DQ2, QSPI1, SPI1, SIG_DESC_SET(SCU438, 14));
 SIG_EXPR_LIST_DECL_SEMG(AD11, TXD13, UART13G1, UART13,
-			SIG_DESC_SET(SCU438, 14));
+			SIG_DESC_CLEAR(SCU4B8, 2), SIG_DESC_SET(SCU4D8, 14));
 PIN_DECL_2(AD11, GPIOZ6, SPI1DQ2, TXD13);
 
 #define AF10 207
 SIG_EXPR_LIST_DECL_SEMG(AF10, SPI1DQ3, QSPI1, SPI1, SIG_DESC_SET(SCU438, 15));
 SIG_EXPR_LIST_DECL_SEMG(AF10, RXD13, UART13G1, UART13,
-			SIG_DESC_SET(SCU438, 15));
+			SIG_DESC_CLEAR(SCU4B8, 3), SIG_DESC_SET(SCU4D8, 15));
 PIN_DECL_2(AF10, GPIOZ7, SPI1DQ3, RXD13);
 
 GROUP_DECL(QSPI1, AB11, AC11, AA11, AD11, AF10);
-- 
2.20.1


  parent reply	other threads:[~2019-10-08  4:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-08  4:41 [PATCH 0/7] pinctrl: Fixes for AST2600 support Andrew Jeffery
2019-10-08  4:41 ` [PATCH 1/7] dt-bindings: pinctrl: aspeed-g6: Rework SD3 function and groups Andrew Jeffery
2019-10-15 22:24   ` Rob Herring
2019-10-08  4:41 ` [PATCH 2/7] pinctrl: aspeed-g6: Sort pins for sanity Andrew Jeffery
2019-10-08  4:41 ` [PATCH 3/7] pinctrl: aspeed-g6: Fix I2C14 SDA description Andrew Jeffery
2019-10-08  4:41 ` [PATCH 4/7] pinctrl: aspeed-g6: Fix I3C3/I3C4 pinmux configuration Andrew Jeffery
2019-10-08  4:41 ` [PATCH 5/7] pinctrl: aspeed-g6: Make SIG_DESC_CLEAR() behave intuitively Andrew Jeffery
2019-10-08  4:41 ` Andrew Jeffery [this message]
2019-10-08  4:41 ` [PATCH 7/7] pinctrl: aspeed-g6: Rename SD3 to EMMC and rework pin groups Andrew Jeffery
2019-10-08  4:54 ` [PATCH 0/7] pinctrl: Fixes for AST2600 support Joel Stanley
2019-10-16 11:19 ` Linus Walleij
2019-10-16 11:41   ` Andrew Jeffery
2019-10-16 14:00     ` Linus Walleij
2019-10-16 23:26       ` Andrew Jeffery

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191008044153.12734-7-andrew@aj.id.au \
    --to=andrew@aj.id.au \
    --cc=devicetree@vger.kernel.org \
    --cc=joel@jms.id.au \
    --cc=johnny_huang@aspeedtech.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=ryanchen.aspeed@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).