Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754678AbcDYL6M (ORCPT ); Mon, 25 Apr 2016 07:58:12 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:17770 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754531AbcDYL6I (ORCPT ); Mon, 25 Apr 2016 07:58:08 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Mon, 25 Apr 2016 04:57:44 -0700 From: Shardar Shariff Md To: , , , , , , , , CC: Shardar Shariff Md Subject: [PATCH v6 3/4] i2c: tegra: add separate function for config_load Date: Mon, 25 Apr 2016 17:27:37 +0530 Message-ID: <1461585458-23948-3-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1461585458-23948-1-git-send-email-smohammed@nvidia.com> References: <1461585458-23948-1-git-send-email-smohammed@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2168 Lines: 76 Define separate function for configuration load register handling to make it use by different functions later. Signed-off-by: Shardar Shariff Md --- 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 --- drivers/i2c/busses/i2c-tegra.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index c1b02c7..8d49995 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -426,6 +426,27 @@ 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) +{ + if (i2c_dev->hw->has_config_load_reg) { + u32 val; + int err; + + i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); + err = readx_poll_timeout(readl, i2c_dev->base + + tegra_i2c_reg_addr(i2c_dev, + I2C_CONFIG_LOAD), 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,20 +500,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) { - u32 val; - - i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); - err = readx_poll_timeout(readl, i2c_dev->base + - tegra_i2c_reg_addr(i2c_dev, - I2C_CONFIG_LOAD), 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