[GIT,PULL] Renesas ARM based r8a7779 SoC updates for v3.11

Submitted by Simon Horman on May 27, 2013, 9 a.m.

Details

Message ID 1369645206-3682-1-git-send-email-horms+renesas@verge.net.au
State New
Headers show

Pull-request

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

Commit Message

Simon Horman May 27, 2013, 9 a.m.
Hi Arnd, Hi Olof,

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-r8a7779-for-v3.11

for you to fetch changes up to b2616eaa65e3ef188ececacdacbd42ce8a778ed9:

  ARM: shmobile: r8A7779: fix Ether device name (2013-05-22 22:17:33 +0900)

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

* Correct Ether device's platform device name. By Sergei Shtylyov.
* Add PCIe clocks. By Phil Edworthy.

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

Sergei Shtylyov (1):
      ARM: shmobile: r8A7779: fix Ether device name

 arch/arm/mach-shmobile/clock-r8a7779.c |    4 +++-
 arch/arm/mach-shmobile/setup-r8a7779.c |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Olof Johansson May 28, 2013, 4 a.m.
Hi,


On Mon, May 27, 2013 at 06:00:06PM +0900, Simon Horman wrote:
> From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
> typo in the platform device's name: used underscore instead of hyphen.

Minor nit: if this has been merged, then including the SHA is useful too.


-Olof
Sergei Shtylyov May 30, 2013, 12:23 p.m.
Hello.

On 28-05-2013 8:00, Olof Johansson wrote:

>> From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>> While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
>> typo in the platform device's name: used underscore instead of hyphen.

> Minor nit: if this has been merged, then including the SHA is useful too.

    Yes, it has been merged in 3.10. Simon, can you do this without me 
reposting the patch? The defective commit's SHA1 ID is 
dace48d04dee46a3409d5e13cd98031522e46377.
    Note that there is analogous R8A7778 Ether fix, the SHA1 for its 
defective commit is 524219146a89aee5366326c225ccd71231419d89.

> -Olof

WBR, Sergei
Simon Horman May 31, 2013, 2:07 a.m.
On Thu, May 30, 2013 at 04:23:00PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 28-05-2013 8:00, Olof Johansson wrote:
> 
> >>From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> >>While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
> >>typo in the platform device's name: used underscore instead of hyphen.
> 
> >Minor nit: if this has been merged, then including the SHA is useful too.
> 
>    Yes, it has been merged in 3.10. Simon, can you do this without
> me reposting the patch? The defective commit's SHA1 ID is
> dace48d04dee46a3409d5e13cd98031522e46377.
>    Note that there is analogous R8A7778 Ether fix, the SHA1 for its
> defective commit is 524219146a89aee5366326c225ccd71231419d89.

Thanks, I will fix up the commit messages.
Sergei Shtylyov June 5, 2013, 9:56 p.m.
Hello.

On 06/04/2013 09:13 AM, Simon Horman wrote:

>>> From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>>
>>> While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
>>> typo in the platform device's name: used underscore instead of hyphen.
>> Minor nit: if this has been merged, then including the SHA is useful too.
> Thanks, I have updated the changelog to:
>
> ARM: shmobile: r8A7779: fix Ether device name
>
> While recasting the commit dace48d04dee46a3409d5e13cd98031522e46377
> ("ARM: shmobile: R8A7779: add Ether support"), I made a
> typo in the platform device's name: used underscore instead of hyphen.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> [horms+renesas@verge.net.au Add SHA of referenced commit to changlog]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
> index b0b3948..c14a69b 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7779.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7779.c
> @@ -443,7 +443,7 @@ void __init r8a7779_add_standard_devices(void)
>   
>   void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
>   {
> -	platform_device_register_resndata(&platform_bus, "sh_eth", -1,
> +	platform_device_register_resndata(&platform_bus, "sh-eth", -1,
>   					  ether_resources,
>   					  ARRAY_SIZE(ether_resources),
>   					  pdata, sizeof(*pdata));

     Actually, if these patches aren't going into 3.10, I think it makes 
sense to drop them,
since I'll be renaming the device and pushing this change thru the 
net-next tree RSN...

WBR, Sergei
Simon Horman June 5, 2013, 11:33 p.m.
On Thu, Jun 06, 2013 at 01:56:01AM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 06/04/2013 09:13 AM, Simon Horman wrote:
> 
> >>>From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>>
> >>>While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
> >>>typo in the platform device's name: used underscore instead of hyphen.
> >>Minor nit: if this has been merged, then including the SHA is useful too.
> >Thanks, I have updated the changelog to:
> >
> >ARM: shmobile: r8A7779: fix Ether device name
> >
> >While recasting the commit dace48d04dee46a3409d5e13cd98031522e46377
> >("ARM: shmobile: R8A7779: add Ether support"), I made a
> >typo in the platform device's name: used underscore instead of hyphen.
> >
> >Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >[horms+renesas@verge.net.au Add SHA of referenced commit to changlog]
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >
> >diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
> >index b0b3948..c14a69b 100644
> >--- a/arch/arm/mach-shmobile/setup-r8a7779.c
> >+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
> >@@ -443,7 +443,7 @@ void __init r8a7779_add_standard_devices(void)
> >  void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
> >  {
> >-	platform_device_register_resndata(&platform_bus, "sh_eth", -1,
> >+	platform_device_register_resndata(&platform_bus, "sh-eth", -1,
> >  					  ether_resources,
> >  					  ARRAY_SIZE(ether_resources),
> >  					  pdata, sizeof(*pdata));
> 
>     Actually, if these patches aren't going into 3.10, I think it
> makes sense to drop them,
> since I'll be renaming the device and pushing this change thru the
> net-next tree RSN...

Sure, I will drop them.
Sergei Shtylyov June 7, 2013, 6:52 p.m.
Hello.

On 06/06/2013 03:33 AM, Simon Horman wrote:

>>>>> From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>>>>
>>>>> While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a
>>>>> typo in the platform device's name: used underscore instead of hyphen.
>>>> Minor nit: if this has been merged, then including the SHA is useful too.
>>> Thanks, I have updated the changelog to:
>>>
>>> ARM: shmobile: r8A7779: fix Ether device name
>>>
>>> While recasting the commit dace48d04dee46a3409d5e13cd98031522e46377
>>> ("ARM: shmobile: R8A7779: add Ether support"), I made a
>>> typo in the platform device's name: used underscore instead of hyphen.
>>>
>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>> [horms+renesas@verge.net.au Add SHA of referenced commit to changlog]
>>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>>>
>>> diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
>>> index b0b3948..c14a69b 100644
>>> --- a/arch/arm/mach-shmobile/setup-r8a7779.c
>>> +++ b/arch/arm/mach-shmobile/setup-r8a7779.c
>>> @@ -443,7 +443,7 @@ void __init r8a7779_add_standard_devices(void)
>>>   void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
>>>   {
>>> -	platform_device_register_resndata(&platform_bus, "sh_eth", -1,
>>> +	platform_device_register_resndata(&platform_bus, "sh-eth", -1,
>>>   					  ether_resources,
>>>   					  ARRAY_SIZE(ether_resources),
>>>   					  pdata, sizeof(*pdata));
>>      Actually, if these patches aren't going into 3.10, I think it
>> makes sense to drop them,
>> since I'll be renaming the device and pushing this change thru the
>> net-next tree RSN...
> Sure, I will drop them.

    OTOH, since Ether support currently isn't working anyway, it doesn't 
make sense
to push it as a consolidated patch with sh_eth.c change, and fix up the 
names up separately
thru the renesas.git anyway. So I'll probably just respin these two 
patches later, when
I'm done with getting rid of #ifdef's in the driver and it's merged by 
Dave...

WBR, Sergei