From: Shardar Shariff Md <smohammed@nvidia.com>
To: <smohammed@nvidia.com>, <ldewangan@nvidia.com>,
<wsa@the-dreams.de>, <swarren@wwwdotorg.org>,
<thierry.reding@gmail.com>, <gnurou@gmail.com>,
<linux-i2c@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v9 2/4] i2c: tegra: add separate function for config_load programing
Date: Mon, 29 Aug 2016 22:06:37 +0530 [thread overview]
Message-ID: <1472488599-13562-2-git-send-email-smohammed@nvidia.com> (raw)
In-Reply-To: <1472488599-13562-1-git-send-email-smohammed@nvidia.com>
Define separate function for configuration load register handling
to make it use by different functions later.
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
---
Changes in v2:
- Remove unnecessary paranthesis and align to 80 characters per line
Changes in v3:
- Add separate function for config load handling
Changes in v4:
- Move timeout calculation to separate patch
Changes in v9:
- Rebase with the changes to earlier patch1
---
---
drivers/i2c/busses/i2c-tegra.c | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 41ffc8a..da79c5e 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -426,6 +426,29 @@ static inline void tegra_i2c_clock_disable(struct tegra_i2c_dev *i2c_dev)
clk_disable(i2c_dev->fast_clk);
}
+static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
+{
+ unsigned long reg_offset;
+ void __iomem *addr;
+ u32 val;
+ int err;
+
+ if (i2c_dev->hw->has_config_load_reg) {
+ reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
+ addr = i2c_dev->base + reg_offset;
+ i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
+ err = readl_poll_timeout(addr, val, val == 0, 1000,
+ I2C_CONFIG_LOAD_TIMEOUT);
+ if (err) {
+ dev_warn(i2c_dev->dev,
+ "timeout waiting for config load\n");
+ return err;
+ }
+ }
+
+ return 0;
+}
+
static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
{
u32 val;
@@ -479,22 +502,9 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (i2c_dev->is_multimaster_mode && i2c_dev->hw->has_slcg_override_reg)
i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE);
- if (i2c_dev->hw->has_config_load_reg) {
- unsigned long reg_offset;
- void __iomem *addr;
- u32 val;
-
- reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
- addr = i2c_dev->base + reg_offset;
- i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
- err = readl_poll_timeout(addr, val, val == 0, 1000,
- I2C_CONFIG_LOAD_TIMEOUT);
- if (err) {
- dev_warn(i2c_dev->dev,
- "timeout waiting for config load\n");
- goto err;
- }
- }
+ err = tegra_i2c_wait_for_config_load(i2c_dev);
+ if (err)
+ goto err;
if (i2c_dev->irq_disabled) {
i2c_dev->irq_disabled = 0;
--
1.8.1.5
next prev parent reply other threads:[~2016-08-29 16:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 16:36 [PATCH v9 1/4] i2c: tegra: use readl_poll_timeout after config_load reg programmed Shardar Shariff Md
2016-08-29 16:36 ` Shardar Shariff Md [this message]
2016-08-29 16:36 ` [PATCH v9 3/4] i2c: tegra: use atomic poll function during configuration Shardar Shariff Md
2016-08-29 16:36 ` [PATCH v9 4/4] i2c: tegra: proper handling of error cases Shardar Shariff Md
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=1472488599-13562-2-git-send-email-smohammed@nvidia.com \
--to=smohammed@nvidia.com \
--cc=gnurou@gmail.com \
--cc=ldewangan@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=wsa@the-dreams.de \
/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).