* [GIT PULL] Renesas ARM based r8a7779 SoC updates for v3.11
@ 2013-05-27 9:00 Simon Horman
2013-05-27 9:00 ` [PATCH 1/2] ARM: shmobile: r8a7779: Add PCIe clocks Simon Horman
2013-05-27 9:00 ` [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name Simon Horman
0 siblings, 2 replies; 12+ messages in thread
From: Simon Horman @ 2013-05-27 9:00 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779: Add PCIe clocks 2013-05-27 9:00 [GIT PULL] Renesas ARM based r8a7779 SoC updates for v3.11 Simon Horman @ 2013-05-27 9:00 ` Simon Horman 2013-05-27 9:00 ` [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name Simon Horman 1 sibling, 0 replies; 12+ messages in thread From: Simon Horman @ 2013-05-27 9:00 UTC (permalink / raw) To: linux-arm-kernel From: Phil Edworthy <Phil.Edworthy@renesas.com> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 31d5cd4..9daeb8c 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -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 */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-05-27 9:00 [GIT PULL] Renesas ARM based r8a7779 SoC updates for v3.11 Simon Horman 2013-05-27 9:00 ` [PATCH 1/2] ARM: shmobile: r8a7779: Add PCIe clocks Simon Horman @ 2013-05-27 9:00 ` Simon Horman 2013-05-28 4:00 ` Olof Johansson 1 sibling, 1 reply; 12+ messages in thread From: Simon Horman @ 2013-05-27 9:00 UTC (permalink / raw) To: linux-arm-kernel 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. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-05-27 9:00 ` [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name Simon Horman @ 2013-05-28 4:00 ` Olof Johansson 2013-05-30 12:23 ` Sergei Shtylyov 2013-06-04 5:13 ` Simon Horman 0 siblings, 2 replies; 12+ messages in thread From: Olof Johansson @ 2013-05-28 4:00 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-05-28 4:00 ` Olof Johansson @ 2013-05-30 12:23 ` Sergei Shtylyov 2013-05-31 2:07 ` Simon Horman 2013-06-04 5:13 ` Simon Horman 1 sibling, 1 reply; 12+ messages in thread From: Sergei Shtylyov @ 2013-05-30 12:23 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-05-30 12:23 ` Sergei Shtylyov @ 2013-05-31 2:07 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2013-05-31 2:07 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-05-28 4:00 ` Olof Johansson 2013-05-30 12:23 ` Sergei Shtylyov @ 2013-06-04 5:13 ` Simon Horman 2013-06-05 21:56 ` Sergei Shtylyov 1 sibling, 1 reply; 12+ messages in thread From: Simon Horman @ 2013-06-04 5:13 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 27, 2013 at 09:00:43PM -0700, Olof Johansson wrote: > 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. 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 at 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)); ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-06-04 5:13 ` Simon Horman @ 2013-06-05 21:56 ` Sergei Shtylyov 2013-06-05 23:33 ` Simon Horman 0 siblings, 1 reply; 12+ messages in thread From: Sergei Shtylyov @ 2013-06-05 21:56 UTC (permalink / raw) To: linux-arm-kernel 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 at 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-06-05 21:56 ` Sergei Shtylyov @ 2013-06-05 23:33 ` Simon Horman 2013-06-07 18:52 ` Sergei Shtylyov 0 siblings, 1 reply; 12+ messages in thread From: Simon Horman @ 2013-06-05 23:33 UTC (permalink / raw) To: linux-arm-kernel 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 at 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. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name 2013-06-05 23:33 ` Simon Horman @ 2013-06-07 18:52 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2013-06-07 18:52 UTC (permalink / raw) To: linux-arm-kernel 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 at 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] ARM: shmobile: R8A7779: fix Ether device name
@ 2013-04-09 17:48 Sergei Shtylyov
2013-04-10 0:42 ` Simon Horman
0 siblings, 1 reply; 12+ messages in thread
From: Sergei Shtylyov @ 2013-04-09 17:48 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
The patch is atop of the 'renesas-next-20130410' tag of the 'renesas.git' tree.
arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: renesas/arch/arm/mach-shmobile/setup-r8a7779.c
===================================================================
--- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c
+++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -443,7 +443,7 @@ void __init r8a7779_add_standard_devices
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));
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: shmobile: R8A7779: fix Ether device name 2013-04-09 17:48 [PATCH 2/2] ARM: shmobile: R8A7779: " Sergei Shtylyov @ 2013-04-10 0:42 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2013-04-10 0:42 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 09, 2013 at 09:48:59PM +0400, Sergei Shtylyov wrote: > 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. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > The patch is atop of the 'renesas-next-20130410' tag of the 'renesas.git' tree. > > arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, queued up in the soc-r8a7779 branch. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2013-06-07 18:52 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-27 9:00 [GIT PULL] Renesas ARM based r8a7779 SoC updates for v3.11 Simon Horman 2013-05-27 9:00 ` [PATCH 1/2] ARM: shmobile: r8a7779: Add PCIe clocks Simon Horman 2013-05-27 9:00 ` [PATCH 2/2] ARM: shmobile: r8A7779: fix Ether device name Simon Horman 2013-05-28 4:00 ` Olof Johansson 2013-05-30 12:23 ` Sergei Shtylyov 2013-05-31 2:07 ` Simon Horman 2013-06-04 5:13 ` Simon Horman 2013-06-05 21:56 ` Sergei Shtylyov 2013-06-05 23:33 ` Simon Horman 2013-06-07 18:52 ` Sergei Shtylyov -- strict thread matches above, loose matches on Subject: below -- 2013-04-09 17:48 [PATCH 2/2] ARM: shmobile: R8A7779: " Sergei Shtylyov 2013-04-10 0:42 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).