Dear Lee,
Could you pick these patchset without RTC patch?
I'll re-send etc patch separately.
Best Regards,
Chanwoo Choi
On Mon, Nov 24, 2014 at 7:04 PM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>> Could you please apply this patchset on your tree
>> or Do we wait the Ack from RTC mainatiner for patch 4?
>
> We still need an Ack from Alessandro.
>
>> On 11/20/2014 01:43 AM, Lee Jones wrote:
>> > On Tue, 18 Nov 2014, Mike Turquette wrote:
>> >
>> >> Quoting Chanwoo Choi (2014-11-18 00:59:41)
>> >>> This patch adds the support for S2MPS13 PMIC clock which is same with existing
>> >>> S2MPS14 RTC IP. But, S2MPS13 uses all of clocks (32khz_{ap|bt|cp}).
>> >>>
>> >>> Cc: Mike Turquette <mturquette@xxxxxxxxxx>
>> >>> Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
>> >>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
>> >>
>> >> Applied to clk-next.
>> >
>> > I'm pretty sure you can't do that. You have a dependency on
>> > linux/mfd/samsung/s2mps13.h, which is satisfied in one of the earlier
>> > patches in the set. If you'd care to just provide an Ack for this
>> > patch, I can send you a pull-request with the decencies met.
>> >
>> >>> ---
>> >>> drivers/clk/clk-s2mps11.c | 24 ++++++++++++++++++++++++
>> >>> 1 file changed, 24 insertions(+)
>> >>>
>> >>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>> >>> index b7797fb..7bb13af 100644
>> >>> --- a/drivers/clk/clk-s2mps11.c
>> >>> +++ b/drivers/clk/clk-s2mps11.c
>> >>> @@ -23,6 +23,7 @@
>> >>> #include <linux/clk-provider.h>
>> >>> #include <linux/platform_device.h>
>> >>> #include <linux/mfd/samsung/s2mps11.h>
>> >>> +#include <linux/mfd/samsung/s2mps13.h>
>> >>> #include <linux/mfd/samsung/s2mps14.h>
>> >>> #include <linux/mfd/samsung/s5m8767.h>
>> >>> #include <linux/mfd/samsung/core.h>
>> >>> @@ -120,6 +121,24 @@ static struct clk_init_data s2mps11_clks_init[S2MPS11_CLKS_NUM] = {
>> >>> },
>> >>> };
>> >>>
>> >>> +static struct clk_init_data s2mps13_clks_init[S2MPS11_CLKS_NUM] = {
>> >>> + [S2MPS11_CLK_AP] = {
>> >>> + .name = "s2mps13_ap",
>> >>> + .ops = &s2mps11_clk_ops,
>> >>> + .flags = CLK_IS_ROOT,
>> >>> + },
>> >>> + [S2MPS11_CLK_CP] = {
>> >>> + .name = "s2mps13_cp",
>> >>> + .ops = &s2mps11_clk_ops,
>> >>> + .flags = CLK_IS_ROOT,
>> >>> + },
>> >>> + [S2MPS11_CLK_BT] = {
>> >>> + .name = "s2mps13_bt",
>> >>> + .ops = &s2mps11_clk_ops,
>> >>> + .flags = CLK_IS_ROOT,
>> >>> + },
>> >>> +};
>> >>> +
>> >>> static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>> >>> [S2MPS11_CLK_AP] = {
>> >>> .name = "s2mps14_ap",
>> >>> @@ -184,6 +203,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>> >>> s2mps11_reg = S2MPS11_REG_RTC_CTRL;
>> >>> clks_init = s2mps11_clks_init;
>> >>> break;
>> >>> + case S2MPS13X:
>> >>> + s2mps11_reg = S2MPS13_REG_RTCCTRL;
>> >>> + clks_init = s2mps13_clks_init;
>> >>> + break;
>> >>> case S2MPS14X:
>> >>> s2mps11_reg = S2MPS14_REG_RTCCTRL;
>> >>> clks_init = s2mps14_clks_init;
>> >>> @@ -279,6 +302,7 @@ static int s2mps11_clk_remove(struct platform_device *pdev)
>> >>>
>> >>> static const struct platform_device_id s2mps11_clk_id[] = {
>> >>> { "s2mps11-clk", S2MPS11X},
>> >>> + { "s2mps13-clk", S2MPS13X},
>> >>> { "s2mps14-clk", S2MPS14X},
>> >>> { "s5m8767-clk", S5M8767X},
>> >>> { },
>> >
>>
>
> --
> 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
