From patchwork Fri May 27 13:37:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shardar Shariff Md X-Patchwork-Id: 627165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rGRs12TFvz9sf9 for ; Fri, 27 May 2016 23:37:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753683AbcE0NhX (ORCPT ); Fri, 27 May 2016 09:37:23 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:1829 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753109AbcE0NhX (ORCPT ); Fri, 27 May 2016 09:37:23 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Fri, 27 May 2016 06:37:23 -0700 Received: from HQMAIL106.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Fri, 27 May 2016 06:35:40 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Fri, 27 May 2016 06:35:40 -0700 Received: from BGMAIL102.nvidia.com (10.25.59.11) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Fri, 27 May 2016 13:37:20 +0000 Received: from HQMAIL107.nvidia.com (172.20.187.13) by bgmail102.nvidia.com (10.25.59.11) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Fri, 27 May 2016 13:37:17 +0000 Received: from shardar-build-machine.nvidia.com (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1130.7 via Frontend Transport; Fri, 27 May 2016 13:37:14 +0000 From: Shardar Shariff Md To: , , , , , , , CC: Subject: [PATCH v8 2/3] i2c: tegra: add separate function for config_load programing Date: Fri, 27 May 2016 19:07:03 +0530 Message-ID: <1464356224-10339-2-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1464356224-10339-1-git-send-email-smohammed@nvidia.com> References: <1464356224-10339-1-git-send-email-smohammed@nvidia.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 7cbeb4e..4e30f86 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -426,6 +426,28 @@ 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; + u32 val; + int err; + + if (i2c_dev->hw->has_config_load_reg) { + reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD); + i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); + err = readx_poll_timeout(readl, i2c_dev->base + reg_offset, + 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,21 +501,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; - unsigned long reg_offset; - - reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD); - i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); - err = readx_poll_timeout(readl, i2c_dev->base + reg_offset, - 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;