[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140320134219.GB6816@lee--X1>
Date: Thu, 20 Mar 2014 13:42:19 +0000
From: Lee Jones <lee.jones@...aro.org>
To: Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc: Mike Turquette <mturquette@...aro.org>,
linux-arm-kernel@...ts.infradead.org,
Sangbeom Kim <sbkim73@...sung.com>,
Samuel Ortiz <sameo@...ux.intel.com>,
linux-kernel@...r.kernel.org, linux-samsung-soc@...r.kernel.org,
Tushar Behera <tushar.behera@...aro.org>,
Yadwinder Singh Brar <yadi.brar@...sung.com>,
Sachin Kamat <sachin.kamat@...aro.org>,
Kyungmin Park <kyungmin.park@...sung.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
Tomasz Figa <t.figa@...sung.com>
Subject: Re: [PATCH v3 1/3] clk: s2mps11: Add support for S2MPS14 clocks
> > > > > This patch adds support for S2MPS14 PMIC clocks (BT and AP) to the
> > > > > s2mps11 clock driver.
> > > > >
> > > > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@...sung.com>
> > > > > Reviewed-by: Yadwinder Singh Brar <yadi.brar@...sung.com>
> > > > > Reviewed-by: Tomasz Figa <t.figa@...sung.com>
> > > >
> > > > This does not apply cleanly to to clk tree trip, nor does it compile
> > > > after manually merging due to changes introducing
> > > > linux/mfd/samsung/s2mps14.h.
> > > >
> > > > The changes look OK to me so maybe Lee can take it with my Ack?
> > > >
> > > > Acked-by: Mike Turquette <mturquette@...aro.org>
> > > >
> > >
> > > Hi,
> > >
> > > Thanks for the Ack. The patch depends on Tushar Behera's patches:
> > > - [PATCH V2 0/2] Add support for clocks in S5M8767
> > > http://thread.gmane.org/gmane.linux.kernel.samsung-soc/27264
> > > which are waiting for some time. Both patchsets should be pulled
> > > together.
> >
> > I took those patches in yesterday. So we have three options:
>
> Great! Thanks.
>
> >
> > 1) MFD tree can pull a stable commit from the clk tree. I'm happy to
> > make a topic branch for this. Then these patches can be applied.
> >
> > 2) clk tree can pull a stable commit from the mfd tree if the mfd folks
> > can provide one.
> >
> > 3) Wait until after the merge window to apply this one to the clk tree.
> > I don't currently plan to send 2 PRs during the merge window, so this
> > could either go in 3.16 or maybe into 3.15 if a split PR is sent.
>
> Dear Lee,
>
> How do you wish to proceed? The patchset depends on changes in sec-core
> MFD driver.
The MFD tree is betting pretty complicated with sec-core stuff at the
minuite. Can I vote for option 3?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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