From patchwork Tue Mar 5 11:16:07 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: 1051700 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 44DDq36qGcz9s4Y for ; Tue, 5 Mar 2019 22:16:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5EBE9C21DED; Tue, 5 Mar 2019 11:16:14 +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 67D1CC21C3F; Tue, 5 Mar 2019 11:16:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 77171C21C29; Tue, 5 Mar 2019 11:16:11 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id 264D7C21C38 for ; Tue, 5 Mar 2019 11:16:11 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed Thread-Index: AQHU00TUMAoTl53OX0yNZfqoFWfZ+g== Date: Tue, 5 Mar 2019 11:16:07 +0000 Message-ID: <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.866100-10.000000 X-TMASE-MatchedRID: CXZ8FQwqLpi3UCG/IQp2PkyQ5fRSh265CqIJhrrDy29ZoZUwtnkREuLz NWBegCW2dLi9Cu3ziTdYF3qW3Je6+wiVeFbUwkZBoqsmjNn2f7RY4g/1eNaQa4U9ccXLFBz3Z8R vRfjUp/OdZ6aUvWpYAJJwWuaN6WlLS+Mb+OLcm6FPl/6VIdnX5gQCdzxuGzyLNwWJ/2nSBXUWU5 ZF6Nobk4u51LXw1EztS1oD4daiqmd+3BndfXUhXQ== 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 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed 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" It only needs to be done once. Signed-off-by: Ismael Luceno --- drivers/i2c/rcar_i2c.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) base-commit: f08023c07d826fbc8e62fdd3367961b2f0b06844 prerequisite-patch-id: 9e5b0458bc15640eb483ccad91dbe85150f9f7be diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 10b0f8bad4..74643b085e 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -116,9 +116,7 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8 chip, u8 read) writel(0, priv->base + RCAR_I2C_ICMSR); writel(priv->icccr, priv->base + RCAR_I2C_ICCCR); - if (priv->type == RCAR_I2C_TYPE_GEN3) - writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR); - + /* Wait for the bus */ ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR, RCAR_I2C_ICMCR_FSDA, false, 2, true); if (ret) { @@ -304,6 +302,10 @@ scgd_find: priv->icccr = (scgd << RCAR_I2C_ICCCR_SCGD_OFF) | cdf; writel(priv->icccr, priv->base + RCAR_I2C_ICCCR); + if (priv->type == RCAR_I2C_TYPE_GEN3) + /* Set SCL/SDA delay */ + writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR); + return 0; } From patchwork Tue Mar 5 11:16:11 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: 1051701 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 44DDqn4NRtz9s47 for ; Tue, 5 Mar 2019 22:16:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 236CAC21DA2; Tue, 5 Mar 2019 11:16:28 +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 00A95C21E02; Tue, 5 Mar 2019 11:16:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BAA1EC21DED; Tue, 5 Mar 2019 11:16:18 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id 6A494C21DF9 for ; Tue, 5 Mar 2019 11:16:14 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 2/6] i2c: rcar_i2c: Add comments about registers & values Thread-Index: AQHU00TWPj5QnMndbkemT2ss2r6RgQ== Date: Tue, 5 Mar 2019 11:16:11 +0000 Message-ID: <20190305111556.17560-2-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-1.497700-10.000000 X-TMASE-MatchedRID: 5e4uYa+cgEOBkjWfpo1TNlz+axQLnAVBVBDQSDMig9GXaPx34rRVKBU3 wdcgT5TyLSHDQi/tZU8RNx/ZPpmNS9GXFpRz8pNh93I1hGUnpBliMXNOf72Zm5soi2XrUn/JUXy 2kgFQ7coqtq5d3cxkNS//v2xz8zQ3yeHe1NYnRYCr1XSIBMNTo4rIA4gs2VV7f1ywC6Q2XUQ17Q z88BL99v0Q6re2/mWSO4sg9YUUtWGlFkmXbKYORN/XB4RPWa3qs5WESolUFo4+jAdc+j1dGnQ34 PlJBtKe9MxXfZDgayZDDKa3G4nrLQ== 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 2/6] i2c: rcar_i2c: Add comments about registers & values 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") drivers/i2c/rcar_i2c.c | 45 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 74643b085e..c1a233b6e9 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -18,35 +18,36 @@ #include #include -#define RCAR_I2C_ICSCR 0x00 -#define RCAR_I2C_ICMCR 0x04 -#define RCAR_I2C_ICMCR_MDBS BIT(7) -#define RCAR_I2C_ICMCR_FSCL BIT(6) -#define RCAR_I2C_ICMCR_FSDA BIT(5) -#define RCAR_I2C_ICMCR_OBPC BIT(4) -#define RCAR_I2C_ICMCR_MIE BIT(3) +#define RCAR_I2C_ICSCR 0x00 /* slave ctrl */ +#define RCAR_I2C_ICMCR 0x04 /* master ctrl */ +#define RCAR_I2C_ICMCR_MDBS BIT(7) /* non-fifo mode switch */ +#define RCAR_I2C_ICMCR_FSCL BIT(6) /* override SCL pin */ +#define RCAR_I2C_ICMCR_FSDA BIT(5) /* override SDA pin */ +#define RCAR_I2C_ICMCR_OBPC BIT(4) /* override pins */ +#define RCAR_I2C_ICMCR_MIE BIT(3) /* master if enable */ #define RCAR_I2C_ICMCR_TSBE BIT(2) -#define RCAR_I2C_ICMCR_FSB BIT(1) -#define RCAR_I2C_ICMCR_ESG BIT(0) -#define RCAR_I2C_ICSSR 0x08 -#define RCAR_I2C_ICMSR 0x0c +#define RCAR_I2C_ICMCR_FSB BIT(1) /* force stop bit */ +#define RCAR_I2C_ICMCR_ESG BIT(0) /* enable start bit gen */ +#define RCAR_I2C_ICSSR 0x08 /* slave status */ +#define RCAR_I2C_ICMSR 0x0c /* master status */ #define RCAR_I2C_ICMSR_MASK 0x7f -#define RCAR_I2C_ICMSR_MNR BIT(6) -#define RCAR_I2C_ICMSR_MAL BIT(5) -#define RCAR_I2C_ICMSR_MST BIT(4) +#define RCAR_I2C_ICMSR_MNR BIT(6) /* Nack */ +#define RCAR_I2C_ICMSR_MAL BIT(5) /* Arbitration lost */ +#define RCAR_I2C_ICMSR_MST BIT(4) /* Stop */ #define RCAR_I2C_ICMSR_MDE BIT(3) #define RCAR_I2C_ICMSR_MDT BIT(2) #define RCAR_I2C_ICMSR_MDR BIT(1) #define RCAR_I2C_ICMSR_MAT BIT(0) -#define RCAR_I2C_ICSIER 0x10 -#define RCAR_I2C_ICMIER 0x14 -#define RCAR_I2C_ICCCR 0x18 +#define RCAR_I2C_ICSIER 0x10 /* slave irq enable */ +#define RCAR_I2C_ICMIER 0x14 /* master irq enable */ +#define RCAR_I2C_ICCCR 0x18 /* clock dividers */ #define RCAR_I2C_ICCCR_SCGD_OFF 3 -#define RCAR_I2C_ICSAR 0x1c -#define RCAR_I2C_ICMAR 0x20 -#define RCAR_I2C_ICRXD_ICTXD 0x24 -#define RCAR_I2C_ICFBSCR 0x38 -#define RCAR_I2C_ICFBSCR_TCYC17 0x0f +#define RCAR_I2C_ICSAR 0x1c /* slave address */ +#define RCAR_I2C_ICMAR 0x20 /* master address */ +#define RCAR_I2C_ICRXD_ICTXD 0x24 /* data port */ +#define RCAR_I2C_ICFBSCR 0x38 /* First Bit Setup Cycle (Gen3) */ +#define RCAR_I2C_ICFBSCR_TCYC17 0x0f /* 17*Tcyc delay 1st bit + between SDA and SCL */ enum rcar_i2c_type { RCAR_I2C_TYPE_GEN2, From patchwork Tue Mar 5 11:16:16 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: 1051703 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 44DDsF6vZqz9s47 for ; Tue, 5 Mar 2019 22:18:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9C0AFC21D56; Tue, 5 Mar 2019 11:16:56 +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 5F04EC21DE8; Tue, 5 Mar 2019 11:16:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 61086C21DAF; Tue, 5 Mar 2019 11:16:24 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id 3BFC9C21E1B for ; Tue, 5 Mar 2019 11:16:19 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 3/6] i2c: rcar_i2c: Fix sending of slave addresses Thread-Index: AQHU00TZ5nuDAY3Iz0ifkLoU2J0MTA== Date: Tue, 5 Mar 2019 11:16:16 +0000 Message-ID: <20190305111556.17560-3-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--0.575300-10.000000 X-TMASE-MatchedRID: DjZ1VoeiMBN81j9Wf8dpYnuTVkeYosXtMZm0+sEE9mtcU0dNErOD+vlY oV6p/cSxuPvdHZpPmaO2qNGaLuHnvmgwIvLATTKBC24oEZ6SpSmcfuxsiY4QFPcrG2viEJkT82r 287JV639Brril29CTPC56vSIiEDYhvkaXbdC/WJ/1RxPOhTJa/j8B/zt8wGe5tptwQUsNQ5yekc szHEoPtBv42euufPAaBldfwMjvRdUXBW1Ofw+P6qpRyloQ8+z8xYVzI3UCCaY= 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 3/6] i2c: rcar_i2c: Fix sending of slave addresses 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" Do the reset before clearing the MSR, otherwise it may result in a read or write operation instead if the start condition is repeated. Signed-off-by: Ismael Luceno Reviewed-by: Marek Vasut --- Notes: Changes since v1: - Rebased on top of patch 1050650 ("i2c: rcar_i2c: Add Gen3 SoC support") drivers/i2c/rcar_i2c.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index c1a233b6e9..7131f0c994 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -130,9 +130,11 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8 chip, u8 read) } writel((chip << 1) | read, priv->base + RCAR_I2C_ICMAR); - writel(0, priv->base + RCAR_I2C_ICMSR); + /* Reset */ writel(RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE | RCAR_I2C_ICMCR_ESG, priv->base + RCAR_I2C_ICMCR); + /* Clear Status */ + writel(0, priv->base + RCAR_I2C_ICMSR); ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMSR, mask, true, 100, true); From patchwork Tue Mar 5 11:16:20 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: 1051702 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 44DDrH59Sxz9s47 for ; Tue, 5 Mar 2019 22:17:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9F4CDC21D9A; Tue, 5 Mar 2019 11:16:42 +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 722F5C21DA2; Tue, 5 Mar 2019 11:16:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B9605C21E0D; Tue, 5 Mar 2019 11:16:26 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id DFD49C21E2B for ; Tue, 5 Mar 2019 11:16:22 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 4/6] i2c: rcar_i2c: Don't mask errors with EREMOTEIO at rcar_i2c_xfer Thread-Index: AQHU00TboYJSabYNSk2KoIyWWvNFOA== Date: Tue, 5 Mar 2019 11:16:20 +0000 Message-ID: <20190305111556.17560-4-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--0.535300-10.000000 X-TMASE-MatchedRID: K6tZv4hqz9UPRVepDWIjxymjEOrcO6AyTJDl9FKHbrkKogmGusPLb43t I4HHvrLy4vM1YF6AJbZEf0B41KrQhtAtbEEX0MxBxEHRux+uk8ifEzJ5hPndGeB6QAF9DUAO1MJ ly7LrLF05m+Q2DZzbJFVAVlmfXt4WkTZEpVbtEXvHHpGFQ4NytSZiCig8trtYMyrwXsFacVuHXM ckZUw78RWsXlpwkvGbJb0gFsgtzp3jqmC1xdPTdfJ3vDpc0p9BVlxr1FJij9s= 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 4/6] i2c: rcar_i2c: Don't mask errors with EREMOTEIO at 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") drivers/i2c/rcar_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 7131f0c994..d6b0418290 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -217,7 +217,7 @@ static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs) ret = rcar_i2c_write_common(dev, msg); if (ret) - return -EREMOTEIO; + return ret; } return ret; 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) From patchwork Tue Mar 5 11:23:18 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: 1051705 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 44DDzN3fRRz9s47 for ; Tue, 5 Mar 2019 22:23:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3781AC21DD4; Tue, 5 Mar 2019 11:23:25 +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 964DDC21C38; Tue, 5 Mar 2019 11:23:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D04B3C21C29; Tue, 5 Mar 2019 11:23:21 +0000 (UTC) Received: from mx1.silicon-gears.com (mx1.silicon-gears.com [81.47.169.96]) by lists.denx.de (Postfix) with ESMTPS id 8CF55C21C38 for ; Tue, 5 Mar 2019 11:23:21 +0000 (UTC) From: Ismael Luceno Cortes To: "u-boot@lists.denx.de" Thread-Topic: [PATCH v2 6/6] i2c: rcar_i2c: Move FSDA check to rcar_i2c_recover Thread-Index: AQHU00XVGQV3U0ZKfkq8sFf67zV6wQ== Date: Tue, 5 Mar 2019 11:23:18 +0000 Message-ID: <20190305112305.17746-1-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--0.438200-10.000000 X-TMASE-MatchedRID: oc6mr1tpUBeKDa5m+5vWeBes/RxhysDbHIOuQjCOKFvfc2Xd6VJ+ylri qBLx+uYbrINFQJrgGEG3nW0OsWYNyh1YpEPWJiyz4pdq9sdj8LX1LHylaO51HyS30GKAkBxW3k1 HMnSDPkeqPbMuMCi6h38mA3sDDq0A9ZmcuHyGo5TdB/CxWTRRuwihQpoXbuXFVN3ALOK0MPkJiu UPmMn6SMQaS+pfTT9i3nBmUhGzJFYK4cJT2br2zJeLEdmKGzDuFwmeEfwItZpom0EITqXQ+BIS6 dBeSBxLLr/soPWz8l7cU7S+vQpXXRLH57MJDJMiHeB9BexqwseeqD9WtJkSIw== 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 6/6] i2c: rcar_i2c: Move FSDA check to rcar_i2c_recover 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" Cosmetic change. Any call to the recover function would need to do the same check afterwards, so it's sensible to make it part of the function. Signed-off-by: Ismael Luceno --- Notes: Changes since v1: - Rebased on top of patch 1050650 ("i2c: rcar_i2c: Add Gen3 SoC support") - Explained the change - Replaced C99-style variable declaration drivers/i2c/rcar_i2c.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 4556b115bd..21bcf09101 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -77,12 +77,13 @@ static int rcar_i2c_finish(struct udevice *dev) return ret; } -static void rcar_i2c_recover(struct udevice *dev) +static int rcar_i2c_recover(struct udevice *dev) { struct rcar_i2c_priv *priv = dev_get_priv(dev); u32 mcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_OBPC; u32 mcra = mcr | RCAR_I2C_ICMCR_FSDA; int i; + u32 ret; /* Send 9 SCL pulses */ for (i = 0; i < 9; i++) { @@ -102,6 +103,9 @@ static void rcar_i2c_recover(struct udevice *dev) udelay(5); writel(mcra | RCAR_I2C_ICMCR_FSCL, priv->base + RCAR_I2C_ICMCR); udelay(5); + + ret = readl(priv->base + RCAR_I2C_ICMSR); + return ret & RCAR_I2C_ICMCR_FSDA; } static int rcar_i2c_set_addr(struct udevice *dev, u8 chip, u8 read) @@ -121,9 +125,7 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8 chip, u8 read) ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR, RCAR_I2C_ICMCR_FSDA, false, 2, true); if (ret) { - rcar_i2c_recover(dev); - val = readl(priv->base + RCAR_I2C_ICMSR); - if (val & RCAR_I2C_ICMCR_FSDA) { + if (rcar_i2c_recover(dev)) { dev_err(dev, "Bus busy, aborting\n"); return ret; }