From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 3/5] pinctrl: intel: Introduce intel_restore_intmask() helper
Date: Tue, 22 Oct 2019 13:00:02 +0300 [thread overview]
Message-ID: <20191022100004.66532-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20191022100004.66532-1-andriy.shevchenko@linux.intel.com>
Refactor restoring GPI_IE registers by using an introduced helper.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/pinctrl/intel/pinctrl-intel.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 1bdc0365e1ad..da34750a420f 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1626,6 +1626,15 @@ static void intel_restore_hostown(struct intel_pinctrl *pctrl, unsigned int c,
dev_warn(dev, "restored hostown %u/%u %#8x->%#8x\n", c, gpp, value, saved);
}
+static void intel_restore_intmask(struct intel_pinctrl *pctrl, unsigned int c,
+ void __iomem *base, unsigned int gpp, u32 saved)
+{
+ struct device *dev = pctrl->dev;
+
+ writel(saved, base + gpp * 4);
+ dev_dbg(dev, "restored mask %u/%u %#08x\n", c, gpp, readl(base + gpp * 4));
+}
+
static void intel_restore_padcfg(struct intel_pinctrl *pctrl, unsigned int pin,
unsigned int reg, u32 saved)
{
@@ -1676,11 +1685,8 @@ int intel_pinctrl_resume_noirq(struct device *dev)
unsigned int gpp;
base = community->regs + community->ie_offset;
- for (gpp = 0; gpp < community->ngpps; gpp++) {
- writel(communities[i].intmask[gpp], base + gpp * 4);
- dev_dbg(dev, "restored mask %d/%u %#08x\n", i, gpp,
- readl(base + gpp * 4));
- }
+ for (gpp = 0; gpp < community->ngpps; gpp++)
+ intel_restore_intmask(pctrl, i, base, gpp, communities[i].intmask[gpp]);
base = community->regs + community->hostown_offset;
for (gpp = 0; gpp < community->ngpps; gpp++)
--
2.23.0
next prev parent reply other threads:[~2019-10-22 10:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 9:59 [PATCH v2 0/5] pinctrl: intel: Refactor register restoring on resume Andy Shevchenko
2019-10-22 10:00 ` [PATCH v2 1/5] pinctrl: intel: Introduce intel_restore_padcfg() helper Andy Shevchenko
2019-11-04 15:07 ` Linus Walleij
2019-10-22 10:00 ` [PATCH v2 2/5] pinctrl: intel: Introduce intel_restore_hostown() helper Andy Shevchenko
2019-10-22 10:00 ` Andy Shevchenko [this message]
2019-10-22 10:00 ` [PATCH v2 4/5] pinctrl: intel: Drop level from warning to debug in intel_restore_hostown() Andy Shevchenko
2019-10-22 10:00 ` [PATCH v2 5/5] pinctrl: intel: Use helper to restore register values on ->resume() Andy Shevchenko
2019-10-23 7:30 ` [PATCH v2 0/5] pinctrl: intel: Refactor register restoring on resume Mika Westerberg
2019-10-23 9:36 ` Andy Shevchenko
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=20191022100004.66532-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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).