From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfram Sang Subject: [PATCH] Bugfixes for i2c-cpm.c Date: Fri, 20 Jun 2008 10:41:55 +0200 Message-ID: <20080620084155.GA17701@pengutronix.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5389117310367902936==" Return-path: 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-NIgtFMG+Po8@public.gmane.org Cc: i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org List-Id: linux-i2c@vger.kernel.org --===============5389117310367902936== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Bugfixes to the i2c-cpm driver - enable correct interrupts (I2CER_TXE instead of I2CER_BUSY) - replace forgotten iic with i2c - fix typo (devided) - prefix debug-output on init with 0x and add frequency Signed-off-by: Wolfram Sang --- Sorry for the resend; the CC to Jochen was dropped, haven't figured out why, yet. 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); @@ -568,7 +568,7 @@ =20 /* * PDIV is set to 00 in i2mod, so brgclk/32 is used as input to the - * i2c baud rate generator. This is devided by 2 x (DIV + 3) to get + * i2c baud rate generator. This is divided by 2 x (DIV + 3) to get * the actual i2c bus frequency. */ brg =3D get_brgfreq() / (32 * 2 * cpm->freq) - 3; --=20 Dipl.-Ing. Wolfram Sang | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry --+HP7ph2BbKc20aGI 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) iD8DBQFIW21TD27XaX1/VRsRAj1aAJ91ZJSPbLnNgHYf1cYlGo7+v2NBVwCgmGlf emSd/7wLfv+CpSTxo26efZU= =Pe7/ -----END PGP SIGNATURE----- --+HP7ph2BbKc20aGI-- --===============5389117310367902936== 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 --===============5389117310367902936==--