From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: [PATCH] OMAP4: I2C: Enable the wakeup in I2C_WE Date: Fri, 29 Jul 2011 17:03:37 +0300 Message-ID: <20110729140336.GU31013@legolas.emea.dhcp.ti.com> References: <1311940122-10681-1-git-send-email-shubhrajyoti@ti.com> <20110729120711.GL31013@legolas.emea.dhcp.ti.com> <4E32A75C.5060400@warmcat.com> <20110729123716.GN31013@legolas.emea.dhcp.ti.com> <4E32B88E.6030508@ti.com> Reply-To: balbi-l0cyMroinI0@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="O9T4zNOkGnr0n+A/" Return-path: Content-Disposition: inline In-Reply-To: <4E32B88E.6030508-l0cyMroinI0@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Shubhrajyoti Cc: balbi-l0cyMroinI0@public.gmane.org, =?utf-8?B?IkFuZHkgR3JlZW4gKOael+WuieW7uCki?= , linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, santosh.shilimkar-l0cyMroinI0@public.gmane.org List-Id: linux-i2c@vger.kernel.org --O9T4zNOkGnr0n+A/ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri, Jul 29, 2011 at 07:11:34PM +0530, Shubhrajyoti wrote: > On Friday 29 July 2011 06:07 PM, Felipe Balbi wrote: > >Hi, > > > >On Fri, Jul 29, 2011 at 01:28:12PM +0100, "Andy Green (=E6=9E=97=E5=AE= =89=E5=BB=B8)" wrote: > >>On 07/29/2011 01:07 PM, Somebody in the thread at some point said: > >> > >>Hi - > >> > >>>- omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->= westate); > >>>+ if (dev->rev< OMAP_I2C_REV_ON_3530_4430) > >>>+ omap_i2c_write_reg(dev, OMAP_I2C_WE_RE= G, > >>>+ dev->w= estate); > >>>Andy, can you clarify why you added the revision check which didn't > >>>exist before ? > >>> > >>>[1] http://git.kernel.org/?p=3Dlinux/kernel/git/khilman/linux-omap-pm.= git;a=3Dcommitdiff;h=3Da3a7acbcc3df4e9ecc12aa1fc435534d74ebbdf4 > >>> > >>At the time I wrote the patches back in March, the code there was > >>different: there was a pre-extant test avoiding that line on 4430, > >>and the patch is simply converting it to the new scheme. You can see > >>it here: > >> > >>http://permalink.gmane.org/gmane.linux.ports.arm.omap/54940 > >> > >>@@ -379,7 +379,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) > >> * REVISIT: Some wkup sources might not be needed. > >> */ > >> dev->westate =3D OMAP_I2C_WE_ALL; > >>- if (dev->rev< OMAP_I2C_REV_ON_4430) > >>+ if (dev->rev< OMAP_I2C_REV_ON_3530_4430) > >> omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, > >> dev->westate); > >> } > >> > >>I guess since March and before this got committed for 3.1, someone > >>got a patch in first removing the test, so when my patchset was > >>uplevelled for commit against 3.1-rc this conflict was dealt with by > >>re-introducing the test. > >> > >>Long story short, it's there from me as a mechanical 1:1 renaming > >>action as part of the fix that 3530 and 4430 (different) IPs return > >>the same rev number. Despite how it now looks I didn't add it, so if > >>Shubhrajyoti has reasons to think it should be gone again I have > >>nothing against that at all. > >yeah, looks like a bad conflict resolution. Shubhrajyoti, care to respin > >the patch and update commit log stating that it is fixing a bad conflict > >resolution or something ? > I wasn't aware of the conflict resolution part. Actually came across this > piece of code as per the discussion on the reset implementation patch > will update > the changelogs. > How about, >=20 > From: Shubhrajyoti D >=20 > Currently for OMAP4 the I2C_WE is not programmed. > This patch enables the programming for OMAP4. >=20 > Fixes a conflict resolution of Andy's patches. I think you need to be a bit more verbose here ;-) Describe what happened and point to the commit number and mailing list archives for references. Imagine someone else reads this commit half a year from now, will s/he have enough information to understand the background of this patch ? --=20 balbi --O9T4zNOkGnr0n+A/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJOMr24AAoJEAv8Txj19kN18IUH/3qUuuCdut/G8nL8JYVa15e4 zbTFGRzqGaPZyL2CE128iPvqUU1uIvhXzmQoJ6QLhvz2n4yoNLTZfgBSgltOE7rN ummvR2ILUEGbm9sPQiLQDLUxRgQMDe4hm4Ayr2Jr1UOVs/BzBcYcnSq4pUw19ITW G1GBzybGshgncEDjCdQS+RrEcdC+k7WaVaDow04lvFXqWjCrF0U6IMtyC+a42Jec FeYabY5Rqh7gtc8fFI88xnDwHFhTMos+9AVKT0ey/bMteWmnLgpkGjnf7OaL++cs KWzry6aNcftpzw864oUp1476O23PRvEbozm6GCCWQL6Dcx2bPz6zuZx/hUmcHgo= =t4Fn -----END PGP SIGNATURE----- --O9T4zNOkGnr0n+A/--