[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <1397646165.6147.16.camel@AMDC1943>
Date: Wed, 16 Apr 2014 13:02:45 +0200
From: Krzysztof Kozlowski <k.kozlowski@...sung.com>
To: Chanwoo Choi <cw00.choi@...sung.com>
Cc: Lee Jones <lee.jones@...aro.org>,
MyungJoo Ham <myungjoo.ham@...sung.com>,
Samuel Ortiz <sameo@...ux.intel.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>, linux-kernel@...r.kernel.org,
Kyungmin Park <kyungmin.park@...sung.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
Subject: Re: [PATCH v5 0/9] mfd: max14577: Add support for MAX77836
On śro, 2014-04-16 at 19:51 +0900, Chanwoo Choi wrote:
> Hi Krzysztof,
>
> On 04/16/2014 07:44 PM, Krzysztof Kozlowski wrote:
> > On śro, 2014-04-16 at 11:28 +0100, Lee Jones wrote:
> >>> This is first part of fifth version of patchset adding support for
> >>> MAX77836 device to the max14577 driver.
> >>>
> >>> I decided to split the patchset into smaller parts. I hope this would
> >>> help in getting necessary review/acks from maintainers.
> >>>
> >>> The first part introduces changes in max14577 driver and adds support
> >>> for MAX77836 in MFD, extcon and regulator drivers. Most of these
> >>> patches already have required acks from maintainers.
> >>> Full v4 patchset can be found here:
> >>> http://thread.gmane.org/gmane.linux.kernel/1654267
> >>
> >> So what's the plan for this driver now? What's missing? Do you have
> >> all the Acks you need? If so, I'm happy to apply this patch-set and
> >> supply a pull-request to the other maintainers.
> >
> > Next patches (part 2):
> > 1. charger: max14577: Add support for MAX77836 charger
> > 2. power: max17040: Add ID for MAX77836 Fuel Gauge block
> > 3. regulator/mfd: max14577: Export symbols for calculating charger
> > current
> > 4. charger: max14577: Configure battery-dependent settings from DTS
> > 5. Documentation: mfd: max14577: Add device tree bindings document
> > 6. regulator: max14577: Implement SUSPEND mode for MAX77836 LDO-s
> >
> > They are quite independent from each other so I think it would be the
> > best if you could prepare an immutable branch with first part of
> > patches.
>
> I have to modify all extcon device drivers for some reason,
> If your patchset including extcon patch apply other git repository,
> this patchset may have potential merge conflict.
>
> If you possible, following patchset would divide two patchset for each mfd/extcon
> to remove potential merge conflict in 3.15 merge window.
> - [PATCH v5 0/9] mfd: max14577: Add support for MAX77836
I think we can resolve this after preparing by Lee the immutable branch
with this patches. You could pull it so your changes to extcon-max14577
would be on newest version.
It would be difficult to split this part1 patchset into two patchsets
because the changes in extcon driver depend on changes in headers for
IRQ-s. Only the patch:
- [PATCH v5 8/9] extcon: max14577: Add support for MAX77836
could be easily taken out and split.
Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists