From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfram Sang Subject: Re: [PATCH] Bugfixes for i2c-cpm.c Date: Fri, 27 Jun 2008 18:58:08 +0200 Message-ID: <20080627165808.GE3931@pengutronix.de> References: <20080619130922.GF3860@pengutronix.de> <486513C5.7040105@scram.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7926958359524960121==" Return-path: In-Reply-To: <486513C5.7040105-NIgtFMG+Po8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org Errors-To: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org To: Jochen Friedrich Cc: i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org List-Id: linux-i2c@vger.kernel.org --===============7926958359524960121== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qftxBdZWiueWNAVY" Content-Disposition: inline --qftxBdZWiueWNAVY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 --- drivers/i2c/busses/i2c-cpm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: drivers/i2c/busses/i2c-cpm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D0x%x)\n", addr); + dev_dbg(&adap->dev, "cpm_i2c_write(abyte=3D0x%x)\n", addr); =20 memcpy(tb+1, pmsg->buf, pmsg->len); =20 @@ -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 @@ =20 cpm_reset_i2c_params(cpm); =20 - 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); --=20 Dipl.-Ing. Wolfram Sang | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry --qftxBdZWiueWNAVY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIZRwgD27XaX1/VRsRAi17AKCGGdYHNkgjaiEKPZAlmTE9ZZZGiwCdFM7M SlD3loqKzMzOtI+HDhyskFg= =u3DP -----END PGP SIGNATURE----- --qftxBdZWiueWNAVY-- --===============7926958359524960121== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ i2c mailing list i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org http://lists.lm-sensors.org/mailman/listinfo/i2c --===============7926958359524960121==--