* Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
@ 2014-07-25 19:44 ` Mike Turquette
2014-08-26 11:50 ` Magnus Damm
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mike Turquette @ 2014-07-25 19:44 UTC (permalink / raw)
To: linux-sh
Quoting Ulrich Hecht (2014-07-25 07:40:47)
> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>
> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> Cc: Mike Turquette <mturquette@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Are you taking this through arm-soc?
Regards,
Mike
> ---
> drivers/clk/shmobile/Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile
> index e002923..531d4f6 100644
> --- a/drivers/clk/shmobile/Makefile
> +++ b/drivers/clk/shmobile/Makefile
> @@ -4,6 +4,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o
> obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o
> obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o
> obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o
> +obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o
> obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o
> obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o
> # for emply built-in.o
> --
> 1.8.4.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
2014-07-25 19:44 ` Mike Turquette
@ 2014-08-26 11:50 ` Magnus Damm
2014-08-26 12:41 ` Laurent Pinchart
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Magnus Damm @ 2014-08-26 11:50 UTC (permalink / raw)
To: linux-sh
Hi Mike,
[CC Simon and Laurent]
On Sat, Jul 26, 2014 at 4:44 AM, Mike Turquette <mturquette@linaro.org> wrote:
> Quoting Ulrich Hecht (2014-07-25 07:40:47)
>> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>>
>> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>> Cc: Mike Turquette <mturquette@linaro.org>
>
> Acked-by: Mike Turquette <mturquette@linaro.org>
Thanks!
> Are you taking this through arm-soc?
Good question. Simon, do you have any preference how to merge this?
Perhaps Laurent remembers how we dealt with the earlier SoCs?
Thanks,
/ magnus
>> ---
>> drivers/clk/shmobile/Makefile | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile
>> index e002923..531d4f6 100644
>> --- a/drivers/clk/shmobile/Makefile
>> +++ b/drivers/clk/shmobile/Makefile
>> @@ -4,6 +4,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o
>> obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o
>> obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o
>> obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o
>> +obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o
>> obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o
>> obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o
>> # for emply built-in.o
>> --
>> 1.8.4.5
>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
2014-07-25 19:44 ` Mike Turquette
2014-08-26 11:50 ` Magnus Damm
@ 2014-08-26 12:41 ` Laurent Pinchart
2014-08-26 23:38 ` Simon Horman
2014-08-26 23:43 ` Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2014-08-26 12:41 UTC (permalink / raw)
To: linux-sh
Hi Magnus,
On Tuesday 26 August 2014 20:50:53 Magnus Damm wrote:
> Hi Mike,
>
> [CC Simon and Laurent]
>
> On Sat, Jul 26, 2014 at 4:44 AM, Mike Turquette wrote:
> > Quoting Ulrich Hecht (2014-07-25 07:40:47)
> >
> >> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> >>
> >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> >> Cc: Mike Turquette <mturquette@linaro.org>
> >
> > Acked-by: Mike Turquette <mturquette@linaro.org>
>
> Thanks!
>
> > Are you taking this through arm-soc?
>
> Good question. Simon, do you have any preference how to merge this?
>
> Perhaps Laurent remembers how we dealt with the earlier SoCs?
As far as git log remembers, they have been merged through Mike's tree.
It all depends on how we want to merge the rest of the series. The risk of
conflict on this specific patch is low, so it can go through Simon's tree if
it helps resolving dependencies with the rest of the series.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
` (2 preceding siblings ...)
2014-08-26 12:41 ` Laurent Pinchart
@ 2014-08-26 23:38 ` Simon Horman
2014-08-26 23:43 ` Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-08-26 23:38 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 26, 2014 at 08:50:53PM +0900, Magnus Damm wrote:
> Hi Mike,
>
> [CC Simon and Laurent]
>
> On Sat, Jul 26, 2014 at 4:44 AM, Mike Turquette <mturquette@linaro.org> wrote:
> > Quoting Ulrich Hecht (2014-07-25 07:40:47)
> >> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> >>
> >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> >> Cc: Mike Turquette <mturquette@linaro.org>
> >
> > Acked-by: Mike Turquette <mturquette@linaro.org>
>
> Thanks!
>
> > Are you taking this through arm-soc?
>
> Good question. Simon, do you have any preference how to merge this?
>
> Perhaps Laurent remembers how we dealt with the earlier SoCs?
Sorry for missing this earlier.
I'm happy to take this through the renesas tree and in turn
for it to go through arm-soc.
I will queue it up accordingly.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
` (3 preceding siblings ...)
2014-08-26 23:38 ` Simon Horman
@ 2014-08-26 23:43 ` Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-08-26 23:43 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 26, 2014 at 02:41:33PM +0200, Laurent Pinchart wrote:
> Hi Magnus,
>
> On Tuesday 26 August 2014 20:50:53 Magnus Damm wrote:
> > Hi Mike,
> >
> > [CC Simon and Laurent]
> >
> > On Sat, Jul 26, 2014 at 4:44 AM, Mike Turquette wrote:
> > > Quoting Ulrich Hecht (2014-07-25 07:40:47)
> > >
> > >> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> > >>
> > >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> > >> Cc: Mike Turquette <mturquette@linaro.org>
> > >
> > > Acked-by: Mike Turquette <mturquette@linaro.org>
> >
> > Thanks!
> >
> > > Are you taking this through arm-soc?
> >
> > Good question. Simon, do you have any preference how to merge this?
> >
> > Perhaps Laurent remembers how we dealt with the earlier SoCs?
>
> As far as git log remembers, they have been merged through Mike's tree.
>
> It all depends on how we want to merge the rest of the series. The risk of
> conflict on this specific patch is low, so it can go through Simon's tree if
> it helps resolving dependencies with the rest of the series.
I don't think there are any dependencies.
But as the risk of conflicts is low I'll see about taking
it through my tree anyway.
^ permalink raw reply [flat|nested] 6+ messages in thread