From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Takeshi Kihara <takeshi.kihara.df@renesas.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Linus Walleij <linus.walleij@linaro.org>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>
Cc: linux-sh@vger.kernel.org, linux-gpio@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 2/5] pinctrl: sh-pfc: r8a7795: Extend SCIF2 pin data
Date: Wed, 26 Aug 2015 18:02:21 +0000 [thread overview]
Message-ID: <1440612144-16877-3-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1440612144-16877-1-git-send-email-geert+renesas@glider.be>
Add missing alternative data pins.
Note that this renames "scif2_data" to "scif2_data_a", and thus requires
a DTS update.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 459929d215f9b8aa..83cce48da9f928b7 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -2288,11 +2288,11 @@ static const unsigned int scif1_data_b_mux[] = {
RX1_B_MARK, TX1_B_MARK,
};
/* - SCIF2 ------------------------------------------------------------------ */
-static const unsigned int scif2_data_pins[] = {
+static const unsigned int scif2_data_a_pins[] = {
/* RX, TX */
RCAR_GP_PIN(5, 11), RCAR_GP_PIN(5, 10),
};
-static const unsigned int scif2_data_mux[] = {
+static const unsigned int scif2_data_a_mux[] = {
RX2_A_MARK, TX2_A_MARK,
};
static const unsigned int scif2_clk_pins[] = {
@@ -2302,6 +2302,13 @@ static const unsigned int scif2_clk_pins[] = {
static const unsigned int scif2_clk_mux[] = {
SCK2_MARK,
};
+static const unsigned int scif2_data_b_pins[] = {
+ /* RX, TX */
+ RCAR_GP_PIN(5, 15), RCAR_GP_PIN(5, 16),
+};
+static const unsigned int scif2_data_b_mux[] = {
+ RX2_B_MARK, TX2_B_MARK,
+};
/* - SCIF3 ------------------------------------------------------------------ */
static const unsigned int scif3_data_a_pins[] = {
/* RX, TX */
@@ -2793,8 +2800,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(scif1_clk),
SH_PFC_PIN_GROUP(scif1_ctrl),
SH_PFC_PIN_GROUP(scif1_data_b),
- SH_PFC_PIN_GROUP(scif2_data),
+ SH_PFC_PIN_GROUP(scif2_data_a),
SH_PFC_PIN_GROUP(scif2_clk),
+ SH_PFC_PIN_GROUP(scif2_data_b),
SH_PFC_PIN_GROUP(scif3_data_a),
SH_PFC_PIN_GROUP(scif3_clk),
SH_PFC_PIN_GROUP(scif3_ctrl),
@@ -2992,8 +3000,9 @@ static const char * const scif1_groups[] = {
};
static const char * const scif2_groups[] = {
- "scif2_data",
+ "scif2_data_a",
"scif2_clk",
+ "scif2_data_b",
};
static const char * const scif3_groups[] = {
--
1.9.1
next prev parent reply other threads:[~2015-08-26 18:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 18:02 [PATCH 0/5] pinctrl: sh-pfc: r8a7795: (H)SCIF Updates Geert Uytterhoeven
2015-08-26 18:02 ` [PATCH 1/5] pinctrl: sh-pfc: r8a7795: Fix and extend SCIF0 pin data Geert Uytterhoeven
2015-08-26 18:02 ` Geert Uytterhoeven [this message]
2015-08-26 18:02 ` [PATCH 3/5] pinctrl: sh-pfc: r8a7795: Fix SCIF5 " Geert Uytterhoeven
2015-08-26 18:02 ` [PATCH 4/5] pinctrl: sh-pfc: r8a7795: Add HSCIF pins, groups, and functions Geert Uytterhoeven
2015-08-26 18:02 ` [PATCH 5/5] arm64: renesas: salvator-x: Update SCIF2 pin group Geert Uytterhoeven
2015-09-25 16:07 ` [PATCH 0/5] pinctrl: sh-pfc: r8a7795: (H)SCIF Updates Linus Walleij
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=1440612144-16877-3-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=takeshi.kihara.df@renesas.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).