| Message ID | 20110824132740.GA28197@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > Hello, > > this series removes the long obsolte mc13783 API after fixing all > remaining users. I posted a patch last month which was touching this MFD too. We will need to synchronize both patch. BTW, Sascha, could you give your ack/nack on my patch (mc13783: add pwr button support) ? it has been a month without any news from your side. Thanks ! Regards, Philippe
On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote: > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > > Hello, > > > > this series removes the long obsolte mc13783 API after fixing all > > remaining users. > > I posted a patch last month which was touching this MFD too. > We will need to synchronize both patch. Ah right. At one point I remembered your patch set because I wondered that ..._USE_REGULATOR is still used. Assuming all involved people are OK with both patch sets I can do the merge of both patch sets. Best regards Uwe
Hi Uwe, On Wed, Aug 24, 2011 at 03:27:40PM +0200, Uwe Kleine-König wrote: > Hello, > > this series removes the long obsolte mc13783 API after fixing all > remaining users. > > The patches touch many subsystems and have some interdependencies: > > - patches 3 and 5 depend on patch 2 > - patch 6 depends on patches 1-5 > > So we have to think about how to merge them when everyone is OK that > they are merged. I am merging them, unless someone objects here. I have applied all 6 patches now. Cheers, Samuel.
Hi Philippe, On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote: > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > > Hello, > > > > this series removes the long obsolte mc13783 API after fixing all > > remaining users. > > I posted a patch last month which was touching this MFD too. > We will need to synchronize both patch. I applied Uwe's patchset now. Could you please sync your code and send me a patchset that applies on top of: git://git.infradead.org/users/sameo/mfd-2.6.git for-next Cheers, Samuel.
Hi Samuel, On Thu, Sep 15, 2011 at 05:12:13PM +0200, Samuel Ortiz wrote: > On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote: > > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > > > Hello, > > > > > > this series removes the long obsolte mc13783 API after fixing all > > > remaining users. > > > > I posted a patch last month which was touching this MFD too. > > We will need to synchronize both patch. > I applied Uwe's patchset now. Thanks. > Could you please sync your code and send me a > patchset that applies on top of: > > git://git.infradead.org/users/sameo/mfd-2.6.git for-next You can fetch the updated series from git://git.pengutronix.de/git/ukl/linux-2.6.git mc13783 I also included the last patch that Sascha commented with: Please ping once the rest is merged. This is OK as I'm currently substituting Sascha for imx maintainer duties while he is on vacation. Merging the above branch into the current imx/for-next branch yields a merge conflict in drivers/rtc/rtc-twl.c which is only touched on your side and in Linus' tree below imx/for-next. I guess you can drop 54d96ef785b5 as it is the same as dec35d19c4 + 34d623d. Best regards Uwe
Hi Uwe, On Thu, Sep 15, 2011 at 06:03:21PM +0200, Uwe Kleine-König wrote: > Hi Samuel, > > On Thu, Sep 15, 2011 at 05:12:13PM +0200, Samuel Ortiz wrote: > > On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote: > > > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > > > > Hello, > > > > > > > > this series removes the long obsolte mc13783 API after fixing all > > > > remaining users. > > > > > > I posted a patch last month which was touching this MFD too. > > > We will need to synchronize both patch. > > I applied Uwe's patchset now. > Thanks. > > > Could you please sync your code and send me a > > patchset that applies on top of: > > > > git://git.infradead.org/users/sameo/mfd-2.6.git for-next > You can fetch the updated series from > > git://git.pengutronix.de/git/ukl/linux-2.6.git mc13783 I merged this one on top of my for-next branch. My MFD tree temporary lives on infradead: git://git.infradead.org/users/sameo/mfd-2.6.git Cheers, Samuel.
Hi ! > On Thu, Sep 15, 2011 at 06:03:21PM +0200, Uwe Kleine-König wrote: > > Hi Samuel, > > > > On Thu, Sep 15, 2011 at 05:12:13PM +0200, Samuel Ortiz wrote: > > > On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote: > > > > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit : > > > > > Hello, > > > > > > > > > > this series removes the long obsolte mc13783 API after fixing all > > > > > remaining users. > > > > > > > > I posted a patch last month which was touching this MFD too. > > > > We will need to synchronize both patch. > > > > > > I applied Uwe's patchset now. > > > > Thanks. > > > > > Could you please sync your code and send > > > me a > > > > > > patchset that applies on top of: > > > > > > git://git.infradead.org/users/sameo/mfd-2.6.git for-next > > > > You can fetch the updated series from > > > > git://git.pengutronix.de/git/ukl/linux-2.6.git mc13783 > > I merged this one on top of my for-next branch. My MFD tree temporary lives > on infradead: > > git://git.infradead.org/users/sameo/mfd-2.6.git Thank you very much to all of you ! Regards, Philippe
Hello, this series removes the long obsolte mc13783 API after fixing all remaining users. The patches touch many subsystems and have some interdependencies: - patches 3 and 5 depend on patch 2 - patch 6 depends on patches 1-5 So we have to think about how to merge them when everyone is OK that they are merged. Best regards Uwe The following changes since commit 14c62e78dc1379185515be41903c4a667efc6d54: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-08-23 18:09:08 -0700) are available in the git repository at: git://git.pengutronix.de/git/ukl/linux-2.6.git mc13xxx David Jander (1): led/mc13783: convert to mc13xxx MFD Uwe Kleine-König (5): mfd/mc13xxx: provide a generic version of adc_do_conversion input/mc13783-ts: convert to mc13xxx API ARM: imx: use mc13xxx constants instead of mc13783 hwmon/mc13783-adc: convert to mc13xxx API mfd/mc13xxx: remove mc13783 API functions and symbols arch/arm/mach-imx/mach-mx27_3ds.c | 4 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 4 +- drivers/hwmon/mc13783-adc.c | 12 ++-- drivers/input/touchscreen/mc13783_ts.c | 34 +++++----- drivers/leds/leds-mc13783.c | 52 ++++++++-------- drivers/mfd/mc13xxx-core.c | 97 ++++++++++++---------------- include/linux/mfd/mc13783.h | 111 -------------------------------- include/linux/mfd/mc13xxx.h | 19 ++++++ 9 files changed, 115 insertions(+), 220 deletions(-)