Re: [PATCH] Bugfixes for i2c-cpm.c

Wolfram Sang
2008-06-27T16:58:08Z

[-- Attachment #1.1: Type: text/plain, Size: 2020 bytes --]

Hi Jochen,

On Fri, Jun 27, 2008 at 06:22:29PM +0200, Jochen Friedrich wrote:

> Could you rebase this to the i2c quilt series (http://khali.linux-fr.org/devel/linux-2.6/)?
Here you go!

Have a nice weekend,

Wolfram

-------------------------------------------------------------------

Bugfixes to the i2c-cpm driver

- enable correct interrupts (I2CER_TXE instead of I2CER_BUSY)
- replace forgotten iic with i2c
- prefix debug-output on init with 0x and add frequency

Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
drivers/i2c/busses/i2c-cpm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Index: drivers/i2c/busses/i2c-cpm.c
===================================================================
--- drivers/i2c/busses/i2c-cpm.c.orig
+++ drivers/i2c/busses/i2c-cpm.c
@@ -241,7 +241,7 @@
eieio();
setbits16(&tbdf->cbd_sc, BD_SC_READY);
} else {
- dev_dbg(&adap->dev, "cpm_iic_write(abyte=0x%x)\n", addr);
+ dev_dbg(&adap->dev, "cpm_i2c_write(abyte=0x%x)\n", addr);

memcpy(tb+1, pmsg->buf, pmsg->len);

@@ -350,7 +350,7 @@
}
/* Start transfer now */
/* Enable RX/TX/Error interupts */
- out_8(&i2c_reg->i2cmr, I2CER_BUSY | I2CER_TXB | I2CER_RXB);
+ out_8(&i2c_reg->i2cmr, I2CER_TXE | I2CER_TXB | I2CER_RXB);
out_8(&i2c_reg->i2cer, 0xff); /* Clear interrupt status */
/* Chip bug, set enable here */
setbits8(&i2c_reg->i2mod, I2MOD_EN); /* Enable */
@@ -553,8 +553,8 @@

cpm_reset_i2c_params(cpm);

- dev_dbg(&cpm->ofdev->dev, "i2c_ram %p, i2c_addr 0x%04x\n",
- cpm->i2c_ram, cpm->i2c_addr);
+ dev_dbg(&cpm->ofdev->dev, "i2c_ram 0x%p, i2c_addr 0x%04x, freq %d\n",
+ cpm->i2c_ram, cpm->i2c_addr, cpm->freq);
dev_dbg(&cpm->ofdev->dev, "tbase 0x%04x, rbase 0x%04x\n",
(u8 __iomem *)cpm->tbase - DPRAM_BASE,
(u8 __iomem *)cpm->rbase - DPRAM_BASE);

--
Dipl.-Ing. Wolfram Sang | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]