| Message ID | 37a15583554f2200be52342511e402b90c9de0eb.1381867974.git.michael.burr@logicpd.com |
|---|---|
| State | Superseded |
| Headers | show |
Hello Michael, Am 15.10.2013 22:23, schrieb Michael Burr: >> Fixed bug with alen == 0 in 'i2c_write', 'i2c_read' > Further minor corrections: >> Write 'address' register before 'data' register. >> Write 'transfer_size' register before 'address' register. > > Signed-off-by: Michael Burr <michael.burr@logicpd.com> > Cc: Heiko Schocher <hs@denx.de> > Cc: Michal Simek <monstr@monstr.eu> > > --- > Tested: > Xilinx ZC702 eval board. > Write and read registers with addresses of length 0 and 1. > > Change history: >> v2: put this in a series instead of by itself >> v3: fixed formatting problem in patch message >> v4: _really_ fixed this time! >> v5: yet another try >> v6: one more time >> v7: again > > v8: After trying many times, I cannot get Patchwork to properly understand the diff in this message. As a workaround, please accept the diff in my patch of 2013-09-24, titled "[U-Boot] I2C: Zynq: Support for 0-length register address", which is 100% > equivalent to the patch in this message (1/2). It should still be applied before the patch in the second message (2/2). Hmm.. please try to post a correct version of this patch, as I not really want to search the correct patch ... I am sure I will pick up the wrong version and I cannot test anything. Thanks! Hmm.. if you have problems with your commit message, you can reedit it: - get the commit id before your commit you want to edit - "git rebase -i commit-id" -> you get a list of commits, see for help maybe here: https://help.github.com/articles/interactive-rebase Please remove the ">" in your commit message ... maybe this confuses patchwork ... bye, Heiko
On 10/16/2013 10:24 AM, Heiko Schocher wrote: > Hello Michael, > > Am 15.10.2013 22:23, schrieb Michael Burr: >>> Fixed bug with alen == 0 in 'i2c_write', 'i2c_read' >> Further minor corrections: >>> Write 'address' register before 'data' register. >>> Write 'transfer_size' register before 'address' register. >> >> Signed-off-by: Michael Burr <michael.burr@logicpd.com> >> Cc: Heiko Schocher <hs@denx.de> >> Cc: Michal Simek <monstr@monstr.eu> >> >> --- >> Tested: >> Xilinx ZC702 eval board. >> Write and read registers with addresses of length 0 and 1. >> >> Change history: >>> v2: put this in a series instead of by itself >>> v3: fixed formatting problem in patch message >>> v4: _really_ fixed this time! >>> v5: yet another try >>> v6: one more time >>> v7: again >> > v8: After trying many times, I cannot get Patchwork to properly understand the diff in this message. As a workaround, please accept the diff in my patch of 2013-09-24, titled "[U-Boot] I2C: Zynq: Support for 0-length register address", which is 100% >> equivalent to the patch in this message (1/2). It should still be applied before the patch in the second message (2/2). > > Hmm.. please try to post a correct version of this patch, as I not > really want to search the correct patch ... I am sure I will pick up > the wrong version and I cannot test anything. > > Thanks! > > Hmm.. if you have problems with your commit message, you can reedit > it: > - get the commit id before your commit you want to edit > - "git rebase -i commit-id" > -> you get a list of commits, see for help maybe here: > https://help.github.com/articles/interactive-rebase > > Please remove the ">" in your commit message ... maybe this confuses > patchwork ... Albert is right. Just use patman -n to see your patches to get it done correctly and then just use patman for sending. There is nice README which describes everything what you need. Thanks, Michal
diff in my patch of 2013-09-24, titled "[U-Boot] I2C: Zynq: Support for 0-length register address", which is 100% equivalent to the patch in this message (1/2). It should still be applied before the patch in the second message (2/2). drivers/i2c/zynq_i2c.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/drivers/i2c/zynq_i2c.c b/drivers/i2c/zynq_i2c.c index ce2d23f..9cbd3e4 100644 --- a/drivers/i2c/zynq_i2c.c +++ b/drivers/i2c/zynq_i2c.c @@ -187,19 +187,21 @@ int i2c_read(u8 dev, uint addr, int alen, u8 *data, int length) * Temporarily disable restart (by clearing hold) * It doesn't seem to work. */ - clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_RW | - ZYNQ_I2C_CONTROL_HOLD); + clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD); writel(0xFF, &zynq_i2c->interrupt_status); - while (alen--) - writel(addr >> (8*alen), &zynq_i2c->data); - writel(dev, &zynq_i2c->address); + if (alen) { + clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_RW); + writel(dev, &zynq_i2c->address); + while (alen--) + writel(addr >> (8*alen), &zynq_i2c->data); - /* Wait for the address to be sent */ - if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) { - /* Release the bus */ - clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD); - return -ETIMEDOUT; + /* Wait for the address to be sent */ + if (!zynq_i2c_wait(ZYNQ_I2C_INTERRUPT_COMP)) { + /* Release the bus */ + clrbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_HOLD); + return -ETIMEDOUT; + } + debug("Device acked address\n"); } - debug("Device acked address\n");