Patchwork [GIT,PULL,v2,00/27] Renesas ARM-based SoC updates for v3.11

login
register
mail settings
Submitter Simon Horman
Date June 7, 2013, 7:51 a.m.
Message ID <1370591517-20239-1-git-send-email-horms+renesas@verge.net.au>
Download mbox
Permalink /patch/249604/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11

Comments

Simon Horman - June 7, 2013, 7:51 a.m.
Hi Olof, Hi Arnd,

The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:

  Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11

for you to fetch changes up to 413bfd0e67894c930242482cd15ac09a800e2ab8:

  ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate (2013-06-07 14:24:52 +0900)

----------------------------------------------------------------
Renesas ARM-based SoC updates for v3.11

* Increased clock coverage for r8a7740, r8a73a4, r8a7778 and r8a7790
* Use fixed clock ratio for r8a7778
* Always use shmobile_setup_delay for sh73a0
* Add add CPUFreq support for sh73a0
* Check kick bit before changing rate on sh73a0
* Do not overwrite all div4 clock operations on sh73a0

* Cleanup SH_FIXED_RATIO_CLK and SH_FIXED_RATIO_CLK macros
* sh73a0: Use DEFINE_RES_MEM*() everywhere
* r8a7740: Make private clock arrays static
* r8a7778: Correct model number

The last four changes listed above are cleanups. I have included them
in this series as all bar the last one are dependencies of non-cleanup
patches.

----------------------------------------------------------------
Bastian Hecht (2):
      ARM: shmobile: r8a7740: Add interim sh-eth device name to clocks list
      ARM: shmobile: r8a7740: Add I2C DT clock names

Guennadi Liakhovetski (4):
      ARM: shmobile: sh73a0: add support for adjusting CPU frequency
      ARM: shmobile: sh73a0: add CPUFreq support
      ARM: shmobile: sh73a0: do not overwrite all div4 clock operations
      ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate

Kuninori Morimoto (13):
      ARM: shmobile: remove ";" from SH_FIXED_RATIO_CLK*() macro
      ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO()
      ARM: shmobile: r8a7778: fixup Ether setup code position
      ARM: shmobile: r8a73a4: add main clock
      ARM: shmobile: r8a73a4: add pll clocks
      ARM: shmobile: r8a73a4: add div4 clocks
      ARM: shmobile: r8a73a4: add div6 clocks
      ARM: shmobile: r8a7778: use fixed ratio clock
      ARM: shmobile: r8a7778: add SDHI clock support
      ARM: shmobile: r8a7778: Register SDHI device
      ARM: shmobile: r8a7790: add main clock
      ARM: shmobile: r8a7790: add div4 clocks
      ARM: shmobile: r8a7790: add div6 clocks

Laurent Pinchart (4):
      ARM: shmobile: r8a7740: Make private clock arrays static
      ARM: shmobile: r8a7740: add TPU PWM support
      ARM: shmobile: r8a7790: Make private clock arrays static
      ARM: shmobile: r8a7790: add TPU PWM support

Magnus Damm (1):
      ARM: shmobile: sh73a0: Always use shmobile_setup_delay()

Phil Edworthy (1):
      ARM: shmobile: r8a7779: Add PCIe clocks

Sergei Shtylyov (1):
      ARM: shmobile: r8a7778: correct model name in Kconfig

Simon Horman (1):
      ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere

 arch/arm/mach-shmobile/Kconfig                |   4 +-
 arch/arm/mach-shmobile/clock-r8a73a4.c        | 375 ++++++++++++++++++++++++--
 arch/arm/mach-shmobile/clock-r8a7740.c        |  11 +-
 arch/arm/mach-shmobile/clock-r8a7778.c        | 156 ++++++++++-
 arch/arm/mach-shmobile/clock-r8a7779.c        |   4 +-
 arch/arm/mach-shmobile/clock-r8a7790.c        | 238 +++++++++++++++-
 arch/arm/mach-shmobile/clock-sh73a0.c         | 111 +++++++-
 arch/arm/mach-shmobile/include/mach/clock.h   |   8 +-
 arch/arm/mach-shmobile/include/mach/r8a7778.h |   2 +
 arch/arm/mach-shmobile/setup-r8a7778.c        |  52 +++-
 arch/arm/mach-shmobile/setup-sh73a0.c         |  95 ++-----
 11 files changed, 924 insertions(+), 132 deletions(-)
Sergei Shtylyov - June 7, 2013, 11:30 a.m.
Hello.

On 07-06-2013 11:51, Simon Horman wrote:

> From: Bastian Hecht <hechtb@gmail.com>

> When we use the ethernet device via DT setup, we need to add it
> to a lookup list until this is properly handled later in a DT-only
> fashion.

> Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/mach-shmobile/clock-r8a7740.c | 1 +
>   1 file changed, 1 insertion(+)

> diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
> index 54afa04..008b11c 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7740.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7740.c
> @@ -592,6 +592,7 @@ static struct clk_lookup lookups[] = {
>   	CLKDEV_DEV_ID("sh_mmcif",		&mstp_clks[MSTP312]),
>   	CLKDEV_DEV_ID("e6bd0000.mmcif",         &mstp_clks[MSTP312]),
>   	CLKDEV_DEV_ID("sh-eth",			&mstp_clks[MSTP309]),
> +	CLKDEV_DEV_ID("e9a00000.sh-eth",	&mstp_clks[MSTP309]),

     I don't quite understand why this is needed. There's no device tree 
support for the 'sh_eth' driver yet. Oh well...

WBR, Sergei
Olof Johansson - June 11, 2013, 7:19 a.m.
Hi Simon,

On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
> 
>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11

Thanks a lot for reshuffling the patches into the categories we use!

For future cases, if you want to split off the cleanups you can do that as
a separate branch, and use that branch as a base for feature branches. Either
way works, sometimes it's nice to see cleanups separated out but it all depends
on volumes, etc.


Pulled into next/soc.



-Olof
Olof Johansson - June 11, 2013, 7:23 a.m.
On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote:
> Hi Simon,
>
> On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote:
>> Hi Olof, Hi Arnd,
>>
>> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
>>
>>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
>
> Thanks a lot for reshuffling the patches into the categories we use!
>
> For future cases, if you want to split off the cleanups you can do that as
> a separate branch, and use that branch as a base for feature branches. Either
> way works, sometimes it's nice to see cleanups separated out but it all depends
> on volumes, etc.
>
>
> Pulled into next/soc.

Actually, I just noticed that this caused a few conflicts with the
pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio
branch into next/soc instead of next/drivers where it was earlier.
Please also check my conflict resolution once the branch has been
pushed out.


Thanks,

-Olof
Simon Horman - June 11, 2013, 7:31 a.m.
On Tue, Jun 11, 2013 at 12:19:25AM -0700, Olof Johansson wrote:
> Hi Simon,
> 
> On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote:
> > Hi Olof, Hi Arnd,
> > 
> > The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
> > 
> >   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
> 
> Thanks a lot for reshuffling the patches into the categories we use!
> 
> For future cases, if you want to split off the cleanups you can do that as
> a separate branch, and use that branch as a base for feature branches. Either
> way works, sometimes it's nice to see cleanups separated out but it all depends
> on volumes, etc.

Thanks. In this case I think it would have worked well
to have soc depend on cleanups. I'll keep that in mind for next time.

> Pulled into next/soc.
> 
> 
> 
> -Olof
>
Simon Horman - June 11, 2013, 8:01 a.m.
On Tue, Jun 11, 2013 at 12:23:40AM -0700, Olof Johansson wrote:
> On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote:
> > Hi Simon,
> >
> > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote:
> >> Hi Olof, Hi Arnd,
> >>
> >> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
> >>
> >>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
> >>
> >> are available in the git repository at:
> >>
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
> >
> > Thanks a lot for reshuffling the patches into the categories we use!
> >
> > For future cases, if you want to split off the cleanups you can do that as
> > a separate branch, and use that branch as a base for feature branches. Either
> > way works, sometimes it's nice to see cleanups separated out but it all depends
> > on volumes, etc.
> >
> >
> > Pulled into next/soc.
> 
> Actually, I just noticed that this caused a few conflicts with the
> pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio
> branch into next/soc instead of next/drivers where it was earlier.
> Please also check my conflict resolution once the branch has been
> pushed out.

Thanks. I have checked and your conflict resolution is the same as mine.

This is an issue that I'm not entirely clear on the best practice for.
Is it sufficient for me to note any conflicts in the pull-request,
or in future should I re-arrange things somehow?
Olof Johansson - June 11, 2013, 8:12 a.m.
On Tue, Jun 11, 2013 at 1:01 AM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Jun 11, 2013 at 12:23:40AM -0700, Olof Johansson wrote:
>> On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote:
>> > Hi Simon,
>> >
>> > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote:
>> >> Hi Olof, Hi Arnd,
>> >>
>> >> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
>> >>
>> >>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
>> >>
>> >> are available in the git repository at:
>> >>
>> >>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
>> >
>> > Thanks a lot for reshuffling the patches into the categories we use!
>> >
>> > For future cases, if you want to split off the cleanups you can do that as
>> > a separate branch, and use that branch as a base for feature branches. Either
>> > way works, sometimes it's nice to see cleanups separated out but it all depends
>> > on volumes, etc.
>> >
>> >
>> > Pulled into next/soc.
>>
>> Actually, I just noticed that this caused a few conflicts with the
>> pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio
>> branch into next/soc instead of next/drivers where it was earlier.
>> Please also check my conflict resolution once the branch has been
>> pushed out.
>
> Thanks. I have checked and your conflict resolution is the same as mine.
>
> This is an issue that I'm not entirely clear on the best practice for.
> Is it sufficient for me to note any conflicts in the pull-request,
> or in future should I re-arrange things somehow?

It's always good to get a heads up that there will be conflicts.
Simple conflicts like these are perfectly fine to expose though.

It's sometimes good to get a reference resolution of them from you --
for example in this case I had originally resolved the conflict
differently from you in your version of the merge (that was part of
the boards branch), so I had to go back and redo it to not cause extra
conflicts there.


-Olof