* [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10
@ 2013-04-05 2:57 Simon Horman
2013-04-05 2:57 ` [PATCH 1/2] ARM: shmobile: r8a7779: add each clocks ratio on comment area Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2013-04-05 2:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
The following changes since commit 8585deb18580d04209a2986430aa0959ef38fce2:
ARM: shmobile: r8a7790 SoC 64-bit DT support (2013-04-02 11:02:21 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-r8a7779-for-v3.10
for you to fetch changes up to dace48d04dee46a3409d5e13cd98031522e46377:
ARM: shmobile: R8A7779: add Ether support (2013-04-05 10:47:03 +0900)
----------------------------------------------------------------
Renesas ARM r8a7779 SoC update for v3.10
Update to the r8a7779 SoC:
* Add SH Ethernet support
* Add comment describing clock ratios
This pull request is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas renesas-soc2-for-v3.10
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: r8a7779: add each clocks ratio on comment area
Sergei Shtylyov (1):
ARM: shmobile: R8A7779: add Ether support
arch/arm/mach-shmobile/clock-r8a7779.c | 23 ++++++++++++++++++++++-
arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 ++
arch/arm/mach-shmobile/setup-r8a7779.c | 23 ++++++++++++++++++++++-
3 files changed, 46 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7779: add each clocks ratio on comment area 2013-04-05 2:57 [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Simon Horman @ 2013-04-05 2:57 ` Simon Horman 2013-04-05 2:57 ` [PATCH 2/2] ARM: shmobile: R8A7779: add Ether support Simon Horman 2013-04-09 12:54 ` [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Arnd Bergmann 2 siblings, 0 replies; 4+ messages in thread From: Simon Horman @ 2013-04-05 2:57 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Adding comment describing the r8a7779 clock frequencies depending on MD pin settings. Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 7d86bfb..5436b51 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -26,6 +26,25 @@ #include <mach/clock.h> #include <mach/common.h> +/* + * MD1 = 1 MD1 = 0 + * (PLLA = 1500) (PLLA = 1600) + * (MHz) (MHz) + *------------------------------------------------+-------------------- + * clkz 1000 (2/3) 800 (1/2) + * clkzs 250 (1/6) 200 (1/8) + * clki 750 (1/2) 800 (1/2) + * clks 250 (1/6) 200 (1/8) + * clks1 125 (1/12) 100 (1/16) + * clks3 187.5 (1/8) 200 (1/8) + * clks4 93.7 (1/16) 100 (1/16) + * clkp 62.5 (1/24) 50 (1/32) + * clkg 62.5 (1/24) 66.6 (1/24) + * clkb, CLKOUT + * (MD2 = 0) 62.5 (1/24) 66.6 (1/24) + * (MD2 = 1) 41.6 (1/36) 50 (1/32) +*/ + #define MD(nr) BIT(nr) #define FRQMR IOMEM(0xffc80014) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: shmobile: R8A7779: add Ether support 2013-04-05 2:57 [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Simon Horman 2013-04-05 2:57 ` [PATCH 1/2] ARM: shmobile: r8a7779: add each clocks ratio on comment area Simon Horman @ 2013-04-05 2:57 ` Simon Horman 2013-04-09 12:54 ` [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Arnd Bergmann 2 siblings, 0 replies; 4+ messages in thread From: Simon Horman @ 2013-04-05 2:57 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Add Ether clock and platform device for R8A7779 SoC; add a function to register this device with board-specific platform data. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +++- arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 ++ arch/arm/mach-shmobile/setup-r8a7779.c | 23 ++++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 5436b51..31d5cd4 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, + MSTP115, MSTP114, MSTP103, MSTP101, MSTP100, MSTP030, MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, @@ -126,6 +126,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */ [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 */ [MSTP101] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 1, 0), /* USB2 */ [MSTP100] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 0, 0), /* USB0/1 */ @@ -162,6 +163,7 @@ static struct clk_lookup lookups[] = { /* MSTP32 clocks */ 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 */ CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */ CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */ CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h index af38750..b58a1f02 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -3,6 +3,7 @@ #include <linux/sh_clk.h> #include <linux/pm_domain.h> +#include <linux/sh_eth.h> /* Pin Function Controller: * GPIO_FN_xx - GPIO used to select pin function @@ -352,6 +353,7 @@ extern void r8a7779_earlytimer_init(void); extern void r8a7779_add_early_devices(void); extern void r8a7779_add_standard_devices(void); extern void r8a7779_add_standard_devices_dt(void); +extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata); extern void r8a7779_clock_init(void); extern void r8a7779_pinmux_init(void); extern void r8a7779_pm_init(void); diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 042df35..689ce67 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -1,8 +1,9 @@ /* * r8a7779 processor support * - * Copyright (C) 2011 Renesas Solutions Corp. + * Copyright (C) 2011, 2013 Renesas Solutions Corp. * Copyright (C) 2011 Magnus Damm + * Copyright (C) 2013 Cogent Embedded, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -347,6 +348,18 @@ static struct platform_device sata_device = { }, }; +/* Ether */ +static struct resource ether_resources[] = { + { + .start = 0xfde00000, + .end = 0xfde003ff, + .flags = IORESOURCE_MEM, + }, { + .start = gic_iid(0xb4), + .flags = IORESOURCE_IRQ, + }, +}; + static struct platform_device *r8a7779_devices_dt[] __initdata = { &scif0_device, &scif1_device, @@ -382,6 +395,14 @@ void __init r8a7779_add_standard_devices(void) ARRAY_SIZE(r8a7779_late_devices)); } +void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata) +{ + platform_device_register_resndata(&platform_bus, "sh_eth", -1, + ether_resources, + ARRAY_SIZE(ether_resources), + pdata, sizeof(*pdata)); +} + /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ void __init __weak r8a7779_register_twd(void) { } -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 2013-04-05 2:57 [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Simon Horman 2013-04-05 2:57 ` [PATCH 1/2] ARM: shmobile: r8a7779: add each clocks ratio on comment area Simon Horman 2013-04-05 2:57 ` [PATCH 2/2] ARM: shmobile: R8A7779: add Ether support Simon Horman @ 2013-04-09 12:54 ` Arnd Bergmann 2 siblings, 0 replies; 4+ messages in thread From: Arnd Bergmann @ 2013-04-09 12:54 UTC (permalink / raw) To: linux-arm-kernel On Friday 05 April 2013, Simon Horman wrote: > The following changes since commit 8585deb18580d04209a2986430aa0959ef38fce2: > > ARM: shmobile: r8a7790 SoC 64-bit DT support (2013-04-02 11:02:21 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-r8a7779-for-v3.10 > > for you to fetch changes up to dace48d04dee46a3409d5e13cd98031522e46377: > > ARM: shmobile: R8A7779: add Ether support (2013-04-05 10:47:03 +0900) > > ---------------------------------------------------------------- > Renesas ARM r8a7779 SoC update for v3.10 > > Update to the r8a7779 SoC: > * Add SH Ethernet support > * Add comment describing clock ratios > > This pull request is based on: > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas renesas-soc2-for-v3.10 > Pulled into next/soc2, thanks! Arnd ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-09 12:54 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-05 2:57 [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Simon Horman 2013-04-05 2:57 ` [PATCH 1/2] ARM: shmobile: r8a7779: add each clocks ratio on comment area Simon Horman 2013-04-05 2:57 ` [PATCH 2/2] ARM: shmobile: R8A7779: add Ether support Simon Horman 2013-04-09 12:54 ` [GIT PULL] Renesas ARM r8a7779 SoC update for v3.10 Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox