Update IXP4xx I2C bus driver
PATCH 1/1 Update IXP4xx I2C bus driver
Greg,
The 2.6 IXP4xx code has been cleaned up to change all references to IXP42x/IXP425 with IXP4xx. The following patch updates the I2C bits. Before applying, you need to 'bk move i2c-ixp42x.c ixp-4xx.c".
Tnx,
~Deepak
drivers/i2c/busses/Kconfig +5 -5
@@ -145,16 +145,16 @@ This support is also available as a module. If so, the module will be called i2c-ite. -config I2C_IXP42X - tristate "IXP42x GPIO-Based I2C Interface" - depends on I2C && ARCH_IXP425 +config I2C_IXP4XX + tristate "IXP4xx GPIO-Based I2C Interface" + depends on I2C && ARCH_IXP4XX select I2C_ALGOBIT help - Say Y here if you have an Intel IXP42x(420,421,422,425) based + Say Y here if you have an Intel IXP4xx(420,421,422,425) based system and are using GPIO lines for an I2C bus. This support is also available as a module. If so, the module - will be called i2c-ixp42x. + will be called i2c-ixp4xx. config I2C_KEYWEST tristate "Powermac Keywest I2C interface"
drivers/i2c/busses/Makefile +1 -1
@@ -15,7 +15,7 @@ obj-$(CONFIG_I2C_IOP3XX) += i2c-iop3xx.o obj-$(CONFIG_I2C_ISA) += i2c-isa.o obj-$(CONFIG_I2C_ITE) += i2c-ite.o -obj-$(CONFIG_I2C_IXP42X) += i2c-ixp42x.o +obj-$(CONFIG_I2C_IXP4XX) += i2c-ixp4xx.o obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest.o obj-$(CONFIG_I2C_NFORCE2) += i2c-nforce2.o obj-$(CONFIG_I2C_PARPORT) += i2c-parport.o
drivers/i2c/busses/i2c-ixp4xx.c +57 -52
209 lines not on this page · raw message
Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/ "Unlike me, many of you have accepted the situation of your imprisonment and will die here like rotten cabbages." - Number 6
PATCH 1/1 Update IXP4xx I2C bus driver
Quoted 3 lines
The 2.6 IXP4xx code has been cleaned up to change all references to IXP42x/IXP425 with IXP4xx. The following patch updates the I2C bits. Before applying, you need to 'bk move
i2c-ixp42x.cixp-4xx.c".
Much noise with no apparent benefit IMVHO. What motivated such a change?
Signature · 2 lines
Jean Delvare http://www.ensicaen.ismra.fr/~delvare/
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaQuoted 4 lines
The change stems from naming change in the ARM port to the IXP4xx. The original code had various variables, macros, and functions named
ixp425_,ixp42x_, andixp4xx_. All these were cleaned up to be ixp4xx instead since the port works on all CPUs in that family.
I understood that.
Quoted 2 lines
W/O these changes, the I2C driver will not build (actually, it won't even appear as an options) once the ARM bits are pushed upstream.
I had not realized that the changes to the i2c bus driver were not independant from the other changes, sorry.
Quoted 2 lines
You can see the latst IXP4xx patch @ ftp://source.mvista.com/pub/ds-patches/patch-2.6.4-ds1.gz
Well, that patch doesn't sound very informative to me. The i2c-ixp42x.c driver is already in 2.6.5 so the relevant patch would be against 2.6.5, not 2.6.4.
BTW, don't you intend to rename i2c-ixp42x.c to i2c-ixp4xx.c as well?
Signature · 2 lines
Jean Delvare http://www.ensicaen.ismra.fr/~delvare/
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaOn Apr 15 2004, at 20:45, Jean Delvare was caught saying:
Quoted 5 lines
Quoted 3 lines
The 2.6 IXP4xx code has been cleaned up to change all references to IXP42x/IXP425 with IXP4xx. The following patch updates the I2C bits. Before applying, you need to 'bk move
i2c-ixp42x.cixp-4xx.c".Much noise with no apparent benefit IMVHO. What motivated such a change?
The change stems from naming change in the ARM port to the IXP4xx. The original code had various variables, macros, and functions named ixp425_, ixp42x_, and ixp4xx_. All these were cleaned up to be ixp4xx instead since the port works on all CPUs in that family. W/O these changes, the I2C driver will not build (actually, it won't even appear as an options) once the ARM bits are pushed upstream. You can see the latst IXP4xx patch @
ftp://source.mvista.com/pub/ds-patches/patch-2.6.4-ds1.gz
Option is to either apply this or to have a broken driver in the tree. The IXP4xx code is not reverting to the mess it was in. :)
~Deepak
Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/ "Unlike me, many of you have accepted the situation of your imprisonment and will die here like rotten cabbages." - Number 6
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaOn Apr 21 2004, at 10:40, Jean Delvare was caught saying:
Quoted 5 lines
Quoted 4 lines
The change stems from naming change in the ARM port to the IXP4xx. The original code had various variables, macros, and functions named
ixp425_,ixp42x_, andixp4xx_. All these were cleaned up to be ixp4xx instead since the port works on all CPUs in that family.
Quoted 7 lines
I understood that.
Quoted 2 lines
W/O these changes, the I2C driver will not build (actually, it won't even appear as an options) once the ARM bits are pushed upstream.
I had not realized that the changes to the i2c bus driver were not independant from the other changes, sorry.
I should have explained it in full detail in my original message. :)
Quoted 6 lines
Quoted 2 lines
You can see the latst IXP4xx patch @ ftp://source.mvista.com/pub/ds-patches/patch-2.6.4-ds1.gz
Well, that patch doesn't sound very informative to me. The
i2c-ixp42x.cdriver is already in 2.6.5 so the relevant patch would be against 2.6.5, not 2.6.4.
True but the I2C-specific portion I posted here applies to 2.6.5. I'm working on getting a full 2.6.5 patch out the door the next few days (or 2.6-rc if we have one by then).
Quoted 1 line
BTW, don't you intend to rename
i2c-ixp42x.ctoi2c-ixp4xx.cas well?
Yep. The easiest way to do this with BK, is to 'bk move i2c-ixp42x i2c-ixp4xx' and than apply the patch on top to rename the references to ixp4xx in the "new" i2c-ixp4xx.c.
~Deepak
Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/ "Unlike me, many of you have accepted the situation of your imprisonment and will die here like rotten cabbages." - Number 6
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaQuoted 3 lines
True but the I2C-specific portion I posted here applies to 2.6.5. I'm working on getting a full 2.6.5 patch out the door the next few days (or 2.6-rc if we have one by then).
Well we have 2.6.6-rc2 already. But the i2c part of you patch should apply equally well against 2.6.5 and 2.6.6-rc, there's no change in the way.
Signature · 2 lines
Jean Delvare http://www.ensicaen.ismra.fr/~delvare/
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaOn Apr 21 2004, at 19:04, Jean Delvare was caught saying:
Quoted 7 lines
Quoted 3 lines
True but the I2C-specific portion I posted here applies to 2.6.5. I'm working on getting a full 2.6.5 patch out the door the next few days (or 2.6-rc if we have one by then).
Well we have 2.6.6-rc2 already. But the i2c part of you patch should apply equally well against 2.6.5 and 2.6.6-rc, there's no change in the way.
Greg, Jean,
Just pinging to see if this patch is headed upstream or still needs some changes?
Tnx,
~Deepak
Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/ "Unlike me, many of you have accepted the situation of your imprisonment and will die here like rotten cabbages." - Number 6
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaQuoted 5 lines · Deepak Saxena
On Apr 21 2004, at 19:04, Jean Delvare was caught saying:
Quoted 4 lines
Quoted 3 lines
True but the I2C-specific portion I posted here applies to 2.6.5. I'm working on getting a full 2.6.5 patch out the door the next few days (or 2.6-rc if we have one by then).
Quoted 8 lines
Quoted 3 lines
Well we have 2.6.6-rc2 already. But the i2c part of you patch should apply equally well against 2.6.5 and 2.6.6-rc, there's no change in the way.
Greg, Jean,
Just pinging to see if this patch is headed upstream or still needs some changes?
It's still in my todo queue, I have a bunch of i2c changes left to apply, sorry for the delay (been busy fixing other, real bugs...). The patch looked ok, and I'll let you know when I apply it.
thanks,
greg k-h
PATCH 1/1 Update IXP4xx I2C bus driver
In reply to Deepak SaxenaQuoted 6 lines · Deepak Saxena
Greg,
The 2.6 IXP4xx code has been cleaned up to change all references to IXP42x/IXP425 with IXP4xx. The following patch updates the I2C bits. Before applying, you need to 'bk move
i2c-ixp42x.cixp-4xx.c".
Hm, I think you meant:
bk mv i2c-ixp42x.c i2c-ixp4xx.c
instead, as that is what your patch reflected :)
I've done that and applied your patch.
thanks,
greg k-h