* [PATCH] i2c/pnx: Really fix start/stop issue
@ 2010-04-18 10:21 Wolfram Sang
[not found] ` <1271586070-12266-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
0 siblings, 1 reply; 11+ messages in thread
From: Wolfram Sang @ 2010-04-18 10:21 UTC (permalink / raw)
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA
Cc: Wolfram Sang, Luotao Fu, Kevin Wells, Ben Dooks, Jean Delvare
The issue was truly solved by the second patch in this thread:
http://thread.gmane.org/gmane.linux.drivers.i2c/5436
Accidently, the first one was picked up. So, this patch adds the
remaining diff (and an additional newline).
Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org>
Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
---
Jean, can you pick this up, so it will be correct in 2.6.34?
drivers/i2c/busses/i2c-pnx.c | 7 ++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 2471033..0853ee1 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -173,6 +173,10 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data)
/* We still have something to talk about... */
val = *alg_data->mif.buf++;
+ /* last byte of a message */
+ if (alg_data->mif.len == 1)
+ val |= stop_bit;
+
alg_data->mif.len--;
iowrite32(val, I2C_REG_TX(alg_data));
@@ -246,6 +250,9 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data)
__func__);
if (alg_data->mif.len == 1) {
+ /* Last byte, do not acknowledge next rcv. */
+ val |= stop_bit;
+
/*
* Enable interrupt RFDAIE (data in Rx fifo),
* and disable DRMIE (need data for Tx)
--
1.7.0
^ permalink raw reply related [flat|nested] 11+ messages in thread[parent not found: <1271586070-12266-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <1271586070-12266-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2010-04-18 11:04 ` Jean Delvare [not found] ` <20100418130457.0341efce-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org> 2010-04-20 0:03 ` Ben Dooks 1 sibling, 1 reply; 11+ messages in thread From: Jean Delvare @ 2010-04-18 11:04 UTC (permalink / raw) To: Wolfram Sang, Ben Dooks Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells Hi Wolfram, On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > The issue was truly solved by the second patch in this thread: > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > Accidently, the first one was picked up. So, this patch adds the > remaining diff (and an additional newline). > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > --- > > Jean, can you pick this up, so it will be correct in 2.6.34? i2c-pnx is for an embedded platform -> this is for Ben. > > drivers/i2c/busses/i2c-pnx.c | 7 ++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c > index 2471033..0853ee1 100644 > --- a/drivers/i2c/busses/i2c-pnx.c > +++ b/drivers/i2c/busses/i2c-pnx.c > @@ -173,6 +173,10 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data) > /* We still have something to talk about... */ > val = *alg_data->mif.buf++; > > + /* last byte of a message */ > + if (alg_data->mif.len == 1) > + val |= stop_bit; > + > alg_data->mif.len--; > iowrite32(val, I2C_REG_TX(alg_data)); > > @@ -246,6 +250,9 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data) > __func__); > > if (alg_data->mif.len == 1) { > + /* Last byte, do not acknowledge next rcv. */ > + val |= stop_bit; > + > /* > * Enable interrupt RFDAIE (data in Rx fifo), > * and disable DRMIE (need data for Tx) -- Jean Delvare ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20100418130457.0341efce-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100418130457.0341efce-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org> @ 2010-04-18 11:40 ` Wolfram Sang [not found] ` <20100418114021.GA21364-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 0 siblings, 1 reply; 11+ messages in thread From: Wolfram Sang @ 2010-04-18 11:40 UTC (permalink / raw) To: Jean Delvare Cc: Ben Dooks, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells [-- Attachment #1: Type: text/plain, Size: 1249 bytes --] On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > Hi Wolfram, > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > The issue was truly solved by the second patch in this thread: > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > Accidently, the first one was picked up. So, this patch adds the > > remaining diff (and an additional newline). > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > --- > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > i2c-pnx is for an embedded platform -> this is for Ben. Would you mind picking it up if he has not done till, let's say, rc6? He did not comment to my pointers so far. Other stuff is pending, too (though not urgent). Maybe he is away/busy? -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20100418114021.GA21364-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100418114021.GA21364-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2010-04-18 16:53 ` Ben Dooks [not found] ` <20100418165306.GB2234-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org> 2010-04-20 0:15 ` Ben Dooks 1 sibling, 1 reply; 11+ messages in thread From: Ben Dooks @ 2010-04-18 16:53 UTC (permalink / raw) To: Wolfram Sang Cc: Jean Delvare, Ben Dooks, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > Hi Wolfram, > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > The issue was truly solved by the second patch in this thread: > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > remaining diff (and an additional newline). > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > --- > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > Would you mind picking it up if he has not done till, let's say, rc6? He did > not comment to my pointers so far. Other stuff is pending, too (though not > urgent). Maybe he is away/busy? Forgot to send last set of fixes after putting them into my git. Will merge and send later today. -- Ben ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20100418165306.GB2234-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100418165306.GB2234-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org> @ 2010-04-18 22:40 ` Wolfram Sang 2010-04-19 16:59 ` Kevin Wells 1 sibling, 0 replies; 11+ messages in thread From: Wolfram Sang @ 2010-04-18 22:40 UTC (permalink / raw) To: Ben Dooks Cc: Jean Delvare, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells [-- Attachment #1: Type: text/plain, Size: 284 bytes --] > Forgot to send last set of fixes after putting them into my git. > > Will merge and send later today. Cool, thanks! -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100418165306.GB2234-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org> 2010-04-18 22:40 ` Wolfram Sang @ 2010-04-19 16:59 ` Kevin Wells [not found] ` <083DF309106F364B939360100EC290F80979C8121C-SIPbe8o7cfX8DdpCu65jn8FrZmdRls4ZQQ4Iyu8u01E@public.gmane.org> 1 sibling, 1 reply; 11+ messages in thread From: Kevin Wells @ 2010-04-19 16:59 UTC (permalink / raw) To: Ben Dooks, Wolfram Sang Cc: Jean Delvare, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Luotao Fu, Vitaly Wool Hi Ben, I'm not sure if you got the other set of 3 i2c-pnx patches yet, one of those patches also fixed this issue. If you haven't installed those patches yet, I'll resubmit them without this fix. thanks, Kevin > -----Original Message----- > From: Ben Dooks [mailto:ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org] > Sent: Sunday, April 18, 2010 9:53 AM > To: Wolfram Sang > Cc: Jean Delvare; Ben Dooks; linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Luotao Fu; Kevin > Wells > Subject: Re: [PATCH] i2c/pnx: Really fix start/stop issue > > On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > > Hi Wolfram, > > > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > > The issue was truly solved by the second patch in this thread: > > > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > > remaining diff (and an additional newline). > > > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > > --- > > > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > > > Would you mind picking it up if he has not done till, let's say, rc6? He > did > > not comment to my pointers so far. Other stuff is pending, too (though not > > urgent). Maybe he is away/busy? > > Forgot to send last set of fixes after putting them into my git. > > Will merge and send later today. > > -- > Ben > ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <083DF309106F364B939360100EC290F80979C8121C-SIPbe8o7cfX8DdpCu65jn8FrZmdRls4ZQQ4Iyu8u01E@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <083DF309106F364B939360100EC290F80979C8121C-SIPbe8o7cfX8DdpCu65jn8FrZmdRls4ZQQ4Iyu8u01E@public.gmane.org> @ 2010-04-19 23:52 ` Ben Dooks 0 siblings, 0 replies; 11+ messages in thread From: Ben Dooks @ 2010-04-19 23:52 UTC (permalink / raw) To: Kevin Wells Cc: Ben Dooks, Wolfram Sang, Jean Delvare, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Luotao Fu, Vitaly Wool On Mon, Apr 19, 2010 at 06:59:29PM +0200, Kevin Wells wrote: > > Hi Ben, > > I'm not sure if you got the other set of 3 i2c-pnx patches > yet, one of those patches also fixed this issue. If you > haven't installed those patches yet, I'll resubmit them > without this fix. I'll check when I get around to rebasing -next, which may not be until later in the week. > thanks, > Kevin > > > -----Original Message----- > > From: Ben Dooks [mailto:ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org] > > Sent: Sunday, April 18, 2010 9:53 AM > > To: Wolfram Sang > > Cc: Jean Delvare; Ben Dooks; linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Luotao Fu; Kevin > > Wells > > Subject: Re: [PATCH] i2c/pnx: Really fix start/stop issue > > > > On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > > > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > > > Hi Wolfram, > > > > > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > > > The issue was truly solved by the second patch in this thread: > > > > > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > > > remaining diff (and an additional newline). > > > > > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > > > --- > > > > > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > > > > > Would you mind picking it up if he has not done till, let's say, rc6? He > > did > > > not comment to my pointers so far. Other stuff is pending, too (though not > > > urgent). Maybe he is away/busy? > > > > Forgot to send last set of fixes after putting them into my git. > > > > Will merge and send later today. > > > > -- > > Ben > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Ben (ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/) 'a smiley only costs 4 bytes' ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100418114021.GA21364-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2010-04-18 16:53 ` Ben Dooks @ 2010-04-20 0:15 ` Ben Dooks [not found] ` <20100420001536.GL32401-elnMNo+KYs3pIgCt6eIbzw@public.gmane.org> 1 sibling, 1 reply; 11+ messages in thread From: Ben Dooks @ 2010-04-20 0:15 UTC (permalink / raw) To: Wolfram Sang Cc: Jean Delvare, Ben Dooks, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > Hi Wolfram, > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > The issue was truly solved by the second patch in this thread: > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > remaining diff (and an additional newline). > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > --- > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > Would you mind picking it up if he has not done till, let's say, rc6? He did > not comment to my pointers so far. Other stuff is pending, too (though not > urgent). Maybe he is away/busy? Could you check my for-linus/i2c branch on git.fluff.org to see if that fixes the problem for you, and if there is anything else that needs fixing. > -- > Pengutronix e.K. | Wolfram Sang | > Industrial Linux Solutions | http://www.pengutronix.de/ | -- Ben (ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/) 'a smiley only costs 4 bytes' ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20100420001536.GL32401-elnMNo+KYs3pIgCt6eIbzw@public.gmane.org>]
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100420001536.GL32401-elnMNo+KYs3pIgCt6eIbzw@public.gmane.org> @ 2010-04-20 7:16 ` Wolfram Sang [not found] ` <20100420071629.GI19957-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 0 siblings, 1 reply; 11+ messages in thread From: Wolfram Sang @ 2010-04-20 7:16 UTC (permalink / raw) To: Ben Dooks Cc: Jean Delvare, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells [-- Attachment #1: Type: text/plain, Size: 2864 bytes --] On Tue, Apr 20, 2010 at 01:15:36AM +0100, Ben Dooks wrote: > On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > > Hi Wolfram, > > > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > > The issue was truly solved by the second patch in this thread: > > > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > > remaining diff (and an additional newline). > > > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > > --- > > > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > > > Would you mind picking it up if he has not done till, let's say, rc6? He did > > not comment to my pointers so far. Other stuff is pending, too (though not > > urgent). Maybe he is away/busy? > > Could you check my for-linus/i2c branch on git.fluff.org to see if > that fixes the problem for you, and if there is anything else that > needs fixing. Looks good to me. Kevin, are you fine, too? All other patches I carry can wait for the next merge window. Just, I'd really like to finally get rid of them then :) The branch is here: The following changes since commit 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f: Linus Torvalds (1): Linux 2.6.34-rc5 are available in the git repository at: git://git.pengutronix.de/git/wsa/linux-2.6.git for-i2c Uwe Kleine-König (2): i2c/pxa: remove unused macro MAINTAINERS: add i2c tree for embedded platforms Wolfram Sang (5): i2c/pxa: only define 'blue_murder'-function if DEBUG is #defined i2c/mpc: drop NO_IRQ i2c/cpm: drop NO_IRQ i2c/ibm-iic: drop NO_IRQ i2c/highlander: remover superflous variable MAINTAINERS | 1 + drivers/i2c/busses/i2c-cpm.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 5 ++--- drivers/i2c/busses/i2c-ibm_iic.c | 14 +++++++------- drivers/i2c/busses/i2c-mpc.c | 6 +++--- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++++++------------ 6 files changed, 28 insertions(+), 26 deletions(-) Is a branch okay or do you prefer a series? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20100420071629.GI19957-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* RE: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <20100420071629.GI19957-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2010-04-20 17:23 ` Kevin Wells 0 siblings, 0 replies; 11+ messages in thread From: Kevin Wells @ 2010-04-20 17:23 UTC (permalink / raw) To: Wolfram Sang, Ben Dooks Cc: Jean Delvare, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Luotao Fu > Subject: Re: [PATCH] i2c/pnx: Really fix start/stop issue > > On Tue, Apr 20, 2010 at 01:15:36AM +0100, Ben Dooks wrote: > > On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > > > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > > > Hi Wolfram, > > > > > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > > > The issue was truly solved by the second patch in this thread: > > > > > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > > > remaining diff (and an additional newline). > > > > > > > > > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > > > > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > > > > > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > > > > > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > > > > > --- > > > > > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > > > > > Would you mind picking it up if he has not done till, let's say, > > > rc6? He did not comment to my pointers so far. Other stuff is > > > pending, too (though not urgent). Maybe he is away/busy? > > > > Could you check my for-linus/i2c branch on git.fluff.org to see if > > that fixes the problem for you, and if there is anything else that > > needs fixing. > > Looks good to me. Kevin, are you fine, too? I just pulled and checked them. They work fine. I'll resubmit the clock optimizations in a future patch. Thanks! > > All other patches I carry can wait for the next merge window. Just, I'd > really like to finally get rid of them then :) The branch is here: > > The following changes since commit 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f: > Linus Torvalds (1): > Linux 2.6.34-rc5 > > are available in the git repository at: > > git://git.pengutronix.de/git/wsa/linux-2.6.git for-i2c > > Uwe Kleine-König (2): > i2c/pxa: remove unused macro > MAINTAINERS: add i2c tree for embedded platforms > > Wolfram Sang (5): > i2c/pxa: only define 'blue_murder'-function if DEBUG is #defined > i2c/mpc: drop NO_IRQ > i2c/cpm: drop NO_IRQ > i2c/ibm-iic: drop NO_IRQ > i2c/highlander: remover superflous variable > > MAINTAINERS | 1 + > drivers/i2c/busses/i2c-cpm.c | 2 +- > drivers/i2c/busses/i2c-highlander.c | 5 ++--- > drivers/i2c/busses/i2c-ibm_iic.c | 14 +++++++------- > drivers/i2c/busses/i2c-mpc.c | 6 +++--- > drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++++++------------ > 6 files changed, 28 insertions(+), 26 deletions(-) > > Is a branch okay or do you prefer a series? > > Regards, > > Wolfram > > -- > Pengutronix e.K. | Wolfram Sang | > Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] i2c/pnx: Really fix start/stop issue [not found] ` <1271586070-12266-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2010-04-18 11:04 ` Jean Delvare @ 2010-04-20 0:03 ` Ben Dooks 1 sibling, 0 replies; 11+ messages in thread From: Ben Dooks @ 2010-04-20 0:03 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Luotao Fu, Kevin Wells, Ben Dooks, Jean Delvare On Sun, Apr 18, 2010 at 12:21:10PM +0200, Wolfram Sang wrote: > The issue was truly solved by the second patch in this thread: > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 Looks like i've got this in my i2c next. > Accidently, the first one was picked up. So, this patch adds the > remaining diff (and an additional newline). > > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Cc: Luotao Fu <l.fu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Cc: Kevin Wells <kevin.wells-3arQi8VN3Tc@public.gmane.org> > Cc: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> > Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> > --- > > Jean, can you pick this up, so it will be correct in 2.6.34? > > drivers/i2c/busses/i2c-pnx.c | 7 ++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c > index 2471033..0853ee1 100644 > --- a/drivers/i2c/busses/i2c-pnx.c > +++ b/drivers/i2c/busses/i2c-pnx.c > @@ -173,6 +173,10 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data) > /* We still have something to talk about... */ > val = *alg_data->mif.buf++; > > + /* last byte of a message */ > + if (alg_data->mif.len == 1) > + val |= stop_bit; > + > alg_data->mif.len--; > iowrite32(val, I2C_REG_TX(alg_data)); > > @@ -246,6 +250,9 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data) > __func__); > > if (alg_data->mif.len == 1) { > + /* Last byte, do not acknowledge next rcv. */ > + val |= stop_bit; > + > /* > * Enable interrupt RFDAIE (data in Rx fifo), > * and disable DRMIE (need data for Tx) > -- > 1.7.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Ben (ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/) 'a smiley only costs 4 bytes' ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-04-20 17:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-18 10:21 [PATCH] i2c/pnx: Really fix start/stop issue Wolfram Sang
[not found] ` <1271586070-12266-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2010-04-18 11:04 ` Jean Delvare
[not found] ` <20100418130457.0341efce-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org>
2010-04-18 11:40 ` Wolfram Sang
[not found] ` <20100418114021.GA21364-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2010-04-18 16:53 ` Ben Dooks
[not found] ` <20100418165306.GB2234-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2010-04-18 22:40 ` Wolfram Sang
2010-04-19 16:59 ` Kevin Wells
[not found] ` <083DF309106F364B939360100EC290F80979C8121C-SIPbe8o7cfX8DdpCu65jn8FrZmdRls4ZQQ4Iyu8u01E@public.gmane.org>
2010-04-19 23:52 ` Ben Dooks
2010-04-20 0:15 ` Ben Dooks
[not found] ` <20100420001536.GL32401-elnMNo+KYs3pIgCt6eIbzw@public.gmane.org>
2010-04-20 7:16 ` Wolfram Sang
[not found] ` <20100420071629.GI19957-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2010-04-20 17:23 ` Kevin Wells
2010-04-20 0:03 ` Ben Dooks
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).