From patchwork Tue Mar 5 11:16:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ismael Luceno Cortes X-Patchwork-Id: 1051704 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=silicon-gears.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44DDsY3Mvgz9s47 for ; Tue, 5 Mar 2019 22:18:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 190F6C21DED; Tue, 5 Mar 2019 11:17:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C16BBC21E0D; Tue, 5 Mar 2019 11:16:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 72E9CC21DA2; Tue, 5 Mar 2019 11:16:29 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id 22785C21E1A for ; Tue, 5 Mar 2019 11:16:26 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 5/6] i2c: rcar_i2c: Set the slave address from rcar_i2c_xfer Thread-Index: AQHU00TdSUMQByhyekCWfP08XgIiCQ== Date: Tue, 5 Mar 2019 11:16:23 +0000 Message-ID: <20190305111556.17560-5-ismael.luceno@silicon-gears.com> References: <20190305111556.17560-1-ismael.luceno@silicon-gears.com> In-Reply-To: <20190305111556.17560-1-ismael.luceno@silicon-gears.com> Accept-Language: en-GB, es-ES, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-User-Approved-Sender: Yes;No X-TMASE-Result: 10--2.522600-10.000000 X-TMASE-MatchedRID: dT2dOY5qbakPRVepDWIjx4GU23hVIa8hTJDl9FKHbrnDBni1PNy9NiRE 1l/6SnLOBLYDz2I1D3WABhmXQhuiGGgwIvLATTKBur1QVFMnSQrEQdG7H66TyJ8TMnmE+d0ZYtm oXEnKV0zv4Rz4jZ3bttl2ZHV5Hrb3cyszu3J8CxkCZ20dV7wXQgbrl9qXEPinISEga9QD/POgEt IHz0gUc7GgVaZVdC3XFaxeWnCS8ZslvSAWyC3OneOqYLXF09N18ne8OlzSn0FWXGvUUmKP2w== X-IMSS-DKIM-White-List: No;No X-TMASE-SNAP-Result: 1.821001.0001-0-1-12:0,22:0,33:0,34:0-0 Cc: Marek Vasut Subject: [U-Boot] [PATCH v2 5/6] i2c: rcar_i2c: Set the slave address from rcar_i2c_xfer X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Ismael Luceno --- Notes: Changes since v1: - Rebased on top of patch 1050650 ("i2c: rcar_i2c: Add Gen3 SoC support") - Fixed masking of return value from rcar_i2c_set_addr drivers/i2c/rcar_i2c.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index d6b0418290..4556b115bd 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -154,10 +154,6 @@ static int rcar_i2c_read_common(struct udevice *dev, struct i2c_msg *msg) u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE; int i, ret = -EREMOTEIO; - ret = rcar_i2c_set_addr(dev, msg->addr, 1); - if (ret) - return ret; - for (i = 0; i < msg->len; i++) { if (msg->len - 1 == i) icmcr |= RCAR_I2C_ICMCR_FSB; @@ -184,10 +180,6 @@ static int rcar_i2c_write_common(struct udevice *dev, struct i2c_msg *msg) u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE; int i, ret = -EREMOTEIO; - ret = rcar_i2c_set_addr(dev, msg->addr, 0); - if (ret) - return ret; - for (i = 0; i < msg->len; i++) { writel(msg->buf[i], priv->base + RCAR_I2C_ICRXD_ICTXD); writel(icmcr, priv->base + RCAR_I2C_ICMCR); @@ -211,6 +203,10 @@ static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs) int ret; for (; nmsgs > 0; nmsgs--, msg++) { + ret = rcar_i2c_set_addr(dev, msg->addr, 1); + if (ret) + return ret; + if (msg->flags & I2C_M_RD) ret = rcar_i2c_read_common(dev, msg); else @@ -220,7 +216,7 @@ static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs) return ret; } - return ret; + return 0; } static int rcar_i2c_probe_chip(struct udevice *dev, uint addr, uint flags)