From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-pm@vger.kernel.org,
"Geert Uytterhoeven" <geert+renesas@glider.be>
Subject: [PATCH 12/14] pinctrl: sh-pfc: r8a7795: Use generic IOCTRL register description
Date: Wed, 4 Oct 2017 11:07:11 +0200 [thread overview]
Message-ID: <1507108033-8606-13-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1507108033-8606-1-git-send-email-geert+renesas@glider.be>
Move R-Car H3 ES2.0 I/O voltage support over to the generic way to
describe IOCTRL registers, which will be needed for suspend/resume
support.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 5e204337079618e6..5edbe8cac76cfaea 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -4603,11 +4603,20 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {
{ },
};
+enum ioctrl_regs {
+ POCCTRL,
+};
+
+static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {
+ [POCCTRL] = { 0xe6060380, },
+ { },
+};
+
static int r8a7795_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *pocctrl)
{
int bit = -EINVAL;
- *pocctrl = 0xe6060380;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL].reg;
if (pin >= RCAR_GP_PIN(3, 0) && pin <= RCAR_GP_PIN(3, 11))
bit = pin & 0x1f;
@@ -4938,6 +4947,7 @@ const struct sh_pfc_soc_info r8a7795_pinmux_info = {
.cfg_regs = pinmux_config_regs,
.drive_regs = pinmux_drive_regs,
.bias_regs = pinmux_bias_regs,
+ .ioctrl_regs = pinmux_ioctrl_regs,
.pinmux_data = pinmux_data,
.pinmux_data_size = ARRAY_SIZE(pinmux_data),
--
2.7.4
next prev parent reply other threads:[~2017-10-04 9:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 9:06 [PATCH 00/14] pinctrl: sh-pfc: Add suspend/resume support Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 01/14] pinctrl: sh-pfc: Remove matching on plain sh-pfc platform device Geert Uytterhoeven
2017-10-04 9:52 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 02/14] pinctrl: sh-pfc: Drop width parameter of sh_pfc_{read,write}_reg() Geert Uytterhoeven
2017-10-04 9:55 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 03/14] pinctrl: sh-pfc: Add generic bias register description Geert Uytterhoeven
2017-10-04 10:26 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 04/14] pinctrl: sh-pfc: Add sh_pfc_pin_to_bias_reg() helper Geert Uytterhoeven
2017-10-04 10:12 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 05/14] pinctrl: sh-pfc: r8a7795-es1: Use generic bias register description Geert Uytterhoeven
2017-10-04 10:40 ` Laurent Pinchart
2017-10-04 10:44 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 06/14] pinctrl: sh-pfc: r8a7795: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 07/14] pinctrl: sh-pfc: r8a7796: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 08/14] pinctrl: sh-pfc: r8a7778: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 09/14] pinctrl: sh-pfc: Remove obsolete sh_pfc_pin_to_bias_info() Geert Uytterhoeven
2017-10-04 10:27 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 10/14] pinctrl: sh-pfc: Add generic IOCTRL register description Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 11/14] pinctrl: sh-pfc: r8a7795-es1: Use " Geert Uytterhoeven
2017-10-04 9:07 ` Geert Uytterhoeven [this message]
2017-10-04 9:07 ` [PATCH 13/14] pinctrl: sh-pfc: r8a7796: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 14/14] pinctrl: sh-pfc: Save/restore registers for PSCI system suspend Geert Uytterhoeven
2017-10-04 19:19 ` [PATCH 00/14] pinctrl: sh-pfc: Add suspend/resume support Geert Uytterhoeven
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=1507108033-8606-13-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
/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).