On Fri, Oct 27, 2017 at 12:31:01PM +0200, Hans de Goede wrote: > Hi, > > On 27-10-17 12:13, Hans de Goede wrote: > > Hi, > > > > On 26-10-17 22:33, Wolfram Sang wrote: > > > On Wed, Oct 11, 2017 at 11:41:21AM +0200, Hans de Goede wrote: > > > > The fusb302 driver as merged in staging uses "typec_fusb302" as i2c-id > > > > rather then just "fusb302" and needs us to set a number of device- > > > > properties, adjust the intel_cht_int33fe driver accordingly. > > > > > > > > One of the properties set is max-snk-mv which makes the fusb302 driver > > > > negotiate up to 12V charging voltage, which is a bad idea on boards > > > > which are not setup to handle this, so this commit also adds 2 extra > > > > sanity checks to make sure that the expected Whiskey Cove PMIC + > > > > TI bq24292i charger combo, which can handle 12V, is present. > > > > > > > > Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> > > > > Acked-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx> > > > > > > I can't apply this one. Is there an immutable branch I need to pick up? > > > Or shall this go via another tree? My base is v4.14-rc5. > > > > It should be applied on top of this patch: > > > > http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git/commitdiff/5c003458db40cf3c89aeddd22c6e934c28b5a565 > > > > From linux-platform-drivers-x86.git/for-next. > > > > So either we are going to need an immutable branch from you > > with the first patch of this series so that the platform/x86 > > maintainers can merge this, or the other way around :| > > Alternatively we could push this patch as a post rc1 fix I guess. I intentionally did not push out yet until this was cleared. So, I think the most simple option is that I create an immutable branch with only the i2c patches from you. Then linux-platform maintainers can pull in my branch and your patch here on top of that. Would be my favourite. D'accord everyone?
Attachment:
signature.asc
Description: PGP signature
