Renesas ARM based r8a7779 SoC updates for v3.11
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(-)
PATCH 1/2 ARM: shmobile: r8a7779: Add PCIe clocks
From: Phil Edworthy <[email protected]>
--- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/clock-r8a7779.c +3 -1
@@ -112,7 +112,7 @@ static struct clk *main_clks[] = { };enum {MSTP323 ,MSTP322 ,MSTP321 ,MSTP320 , -MSTP115 ,MSTP114 , +MSTP116 ,MSTP115 ,MSTP114 ,MSTP103 ,MSTP101 ,MSTP100 ,MSTP030 ,MSTP029 ,MSTP028 ,MSTP027 ,MSTP026 ,MSTP025 ,MSTP024 ,MSTP023 ,MSTP022 ,MSTP021 ,
@@ -125,6 +125,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP322] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 22, 0), /* SDHI1 */ [MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */ + [MSTP116] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 16, 0), /* PCIe */ [MSTP115] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 15, 0), /* SATA */ [MSTP114] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 14, 0), /* Ether */ [MSTP103] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 3, 0), /* DU */
@@ -161,6 +162,7 @@ static struct clk_lookup lookups[] = {CLKDEV_CON_ID ("peripheral_clk" , &clkp_clk),/* MSTP32 clocks */ +CLKDEV_DEV_ID ("rcar-pcie" , &mstp_clks[MSTP116 ]),/* PCIe */ CLKDEV_DEV_ID ("sata_rcar" , &mstp_clks[MSTP115 ]),/* SATA */ CLKDEV_DEV_ID ("fc600000.sata" , &mstp_clks[MSTP115 ]),/* SATA w/DT */ CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
Signature · 1 line
1.7.10.4
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
In reply to Simon HormanFrom: Sergei Shtylyov <[email protected]>
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.
--- arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-shmobile/setup-r8a7779.c +1 -1
@@ -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));
Signature · 1 line
1.7.10.4
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Hi,
Quoted 4 lines · Simon Horman
From: Sergei Shtylyov <[email protected]>
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
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Hello.
Quoted 6 lines · Olof Johansson
Quoted 4 lines
From: Sergei Shtylyov <[email protected]>
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.
Quoted 1 line
-Olof
WBR, Sergei
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Quoted 9 lines · Sergei Shtylyov
Hello.
Quoted 4 lines · Olof Johansson
Quoted 4 lines
From: Sergei Shtylyov <[email protected]>
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.
Quoted 7 lines
Quoted 1 line
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 isdace48d04dee46a3409d5e13cd98031522e46377.
Note that there is analogous R8A7778 Ether fix, the SHA1 for its
defective commit is524219146a89aee5366326c225ccd71231419d89.
Thanks, I will fix up the commit messages.
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
In reply to Olof JohanssonQuoted 10 lines · Olof Johansson
Hi,
Quoted 4 lines · Simon Horman
From: Sergei Shtylyov <[email protected]>
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.
arch/arm/mach-shmobile/setup-r8a7779.c +1 -1
@@ -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));
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Hello.
Quoted 22 lines · Simon Horman
Quoted 5 lines
Quoted 4 lines
From: Sergei Shtylyov <[email protected]>
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 <[email protected]>[horms+renesas at verge.net.au Add SHA of referenced commit to changlog]Signed-off-by Simon Horman <[email protected]>arch/arm/mach-shmobile/setup-r8a7779.c +0
-0
arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices(void) · line 449
Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c +1
-1@@ -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
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Quoted 30 lines · Sergei Shtylyov
Hello.
Quoted 26 lines · Simon Horman
Quoted 5 lines
Quoted 4 lines
From: Sergei Shtylyov <[email protected]>
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 <[email protected]>[horms+renesas at verge.net.au Add SHA of referenced commit to changlog]Signed-off-by Simon Horman <[email protected]>arch/arm/mach-shmobile/setup-r8a7779.c +1
-1@@ -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,
Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices(void) · line 449
Quoted 3 lines
arch/arm/mach-shmobile/setup-r8a7779.c +0
-0ether_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.
PATCH 2/2 ARM: shmobile: r8A7779: fix Ether device name
Hello.
Quoted 33 lines · Simon Horman
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 4 lines
From: Sergei Shtylyov <[email protected]>
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 <[email protected]>[horms+renesas at verge.net.au Add SHA of referenced commit to changlog]Signed-off-by Simon Horman <[email protected]>Quoted 16 lines
arch/arm/mach-shmobile/setup-r8a7779.c void __init r8a7779_add_standard_devices(void) · line 448
Quoted 12 lines
arch/arm/mach-shmobile/setup-r8a7779.c +1
-1@@ -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...
Quoted 1 line
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