From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@linaro.org (Mike Turquette) Date: Thu, 20 Mar 2014 09:33:35 -0700 Subject: [PATCH v3 1/3] clk: s2mps11: Add support for S2MPS14 clocks In-Reply-To: <20140320134219.GB6816@lee--X1> References: <1395047958-17953-1-git-send-email-k.kozlowski@samsung.com> <1395047958-17953-2-git-send-email-k.kozlowski@samsung.com> <20140319001643.30995.46947@quantum> <1395215408.18730.2.camel@AMDC1943> <20140319191117.30995.13715@quantum> <1395319557.22979.1.camel@AMDC1943> <20140320134219.GB6816@lee--X1> Message-ID: <20140320163335.21989.2611@quantum> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Quoting Lee Jones (2014-03-20 06:42:19) > > > > > > This patch adds support for S2MPS14 PMIC clocks (BT and AP) to the > > > > > > s2mps11 clock driver. > > > > > > > > > > > > Signed-off-by: Krzysztof Kozlowski > > > > > > Reviewed-by: Yadwinder Singh Brar > > > > > > Reviewed-by: Tomasz Figa > > > > > > > > > > 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 > > > > > > > > > > > > > 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? Sure. clock tree feels the same way. ;-) Regards, Mike > > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org ? Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog