* [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11
@ 2013-06-06 7:28 Simon Horman
2013-06-06 7:28 ` [PATCH 1/5] ARM: shmobile: r8a7740: Make private clock arrays static Simon Horman
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw)
To: linux-arm-kernel
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-cleanup-for-v3.11
for you to fetch changes up to b9d02b5dc95bdbce73d0adceb1a3d20eb3068c8b:
ARM: shmobile: marzen: keep local function as static (2013-06-06 14:14:13 +0900)
----------------------------------------------------------------
Renesas ARM based SoC cleanups for v3.11
* marzen: Make local function static
* sh73a0: Use DEFINE_RES_MEM*() everywhere
* r8a7778: Correct model number
* Clean Up SH_CLK_SET_RATIO() and SH_FIXED_RATIO_CLK() macros
* r8a7740: Make private clock arrays static
----------------------------------------------------------------
Kuninori Morimoto (2):
ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO()
ARM: shmobile: marzen: keep local function as static
Laurent Pinchart (1):
ARM: shmobile: r8a7740: Make private clock arrays static
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 | 2 +-
arch/arm/mach-shmobile/board-marzen.c | 2 +-
arch/arm/mach-shmobile/clock-r8a7740.c | 4 +-
arch/arm/mach-shmobile/include/mach/clock.h | 4 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 79 +++++------------------------
5 files changed, 19 insertions(+), 72 deletions(-)
--
1.8.2.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/5] ARM: shmobile: r8a7740: Make private clock arrays static 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman @ 2013-06-06 7:28 ` Simon Horman 2013-06-06 7:28 ` [PATCH 2/5] ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() Simon Horman ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw) To: linux-arm-kernel From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Both clock-r8a7740.c and clock-r8a7790.c define a div4_clks array as non-static. Compiling support for both SoCs thus result in a symbol redefinition. Fix it by defining the arrays as static. To avoid further similar issues, also define the main_clks as static. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7740.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index c0d39aa..54afa04 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -266,7 +266,7 @@ static struct clk fsiack_clk = { static struct clk fsibck_clk = { }; -struct clk *main_clks[] = { +static struct clk *main_clks[] = { &extalr_clk, &extal1_clk, &extal2_clk, @@ -317,7 +317,7 @@ enum { DIV4_NR }; -struct clk div4_clks[DIV4_NR] = { +static struct clk div4_clks[DIV4_NR] = { [DIV4_I] = SH_CLK_DIV4(&pllc1_clk, FRQCRA, 20, 0x6fff, CLK_ENABLE_ON_INIT), [DIV4_ZG] = SH_CLK_DIV4(&pllc1_clk, FRQCRA, 16, 0x6fff, CLK_ENABLE_ON_INIT), [DIV4_B] = SH_CLK_DIV4(&pllc1_clk, FRQCRA, 8, 0x6fff, CLK_ENABLE_ON_INIT), -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman 2013-06-06 7:28 ` [PATCH 1/5] ARM: shmobile: r8a7740: Make private clock arrays static Simon Horman @ 2013-06-06 7:28 ` Simon Horman 2013-06-06 7:28 ` [PATCH 3/5] ARM: shmobile: r8a7778: correct model name in Kconfig Simon Horman ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> SH_CLK_SET_RATIO() will be trouble without this patch Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/include/mach/clock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/include/mach/clock.h b/arch/arm/mach-shmobile/include/mach/clock.h index 76ac612..ce29720 100644 --- a/arch/arm/mach-shmobile/include/mach/clock.h +++ b/arch/arm/mach-shmobile/include/mach/clock.h @@ -31,9 +31,9 @@ static SH_FIXED_RATIO_CLKg(name, p, r); SH_FIXED_RATIO_CLK(name, p, name); #define SH_CLK_SET_RATIO(p, m, d) \ -{ \ +do { \ (p)->mul = m; \ (p)->div = d; \ -} +} while (0) #endif -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] ARM: shmobile: r8a7778: correct model name in Kconfig 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman 2013-06-06 7:28 ` [PATCH 1/5] ARM: shmobile: r8a7740: Make private clock arrays static Simon Horman 2013-06-06 7:28 ` [PATCH 2/5] ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() Simon Horman @ 2013-06-06 7:28 ` Simon Horman 2013-06-06 7:28 ` [PATCH 4/5] ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere Simon Horman ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> The correct model name is R-Car M1A or R8A77781; R8A77780 corresponds to R-Car M1S which is a SH based SoC. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> [horms+renesas@verge.net.au: manually applied] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 1a517e2..52e8c6e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -36,7 +36,7 @@ config ARCH_R8A7740 select RENESAS_INTC_IRQPIN config ARCH_R8A7778 - bool "R-Car M1 (R8A77780)" + bool "R-Car M1A (R8A77781)" select CPU_V7 select SH_CLK_CPG select ARM_GIC -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman ` (2 preceding siblings ...) 2013-06-06 7:28 ` [PATCH 3/5] ARM: shmobile: r8a7778: correct model name in Kconfig Simon Horman @ 2013-06-06 7:28 ` Simon Horman 2013-06-06 7:28 ` [PATCH 5/5] ARM: shmobile: marzen: keep local function as static Simon Horman 2013-06-06 7:39 ` [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw) To: linux-arm-kernel Convert code to use DEFINE_RES_MEM*() macros. These macros were already used in this file, this change makes their usage consistent throughout the file. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/setup-sh73a0.c | 79 ++++++----------------------------- 1 file changed, 13 insertions(+), 66 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index fdf3894..3bc33a5 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -288,12 +288,7 @@ static struct sh_timer_config tmu00_platform_data = { }; static struct resource tmu00_resources[] = { - [0] = { - .name = "TMU00", - .start = 0xfff60008, - .end = 0xfff60013, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xfff60008, 0xc, "TMU00"), [1] = { .start = intcs_evt2irq(0x0e80), /* TMU0_TUNI00 */ .flags = IORESOURCE_IRQ, @@ -318,12 +313,7 @@ static struct sh_timer_config tmu01_platform_data = { }; static struct resource tmu01_resources[] = { - [0] = { - .name = "TMU01", - .start = 0xfff60014, - .end = 0xfff6001f, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xfff60014, 0xc, "TMU00"), [1] = { .start = intcs_evt2irq(0x0ea0), /* TMU0_TUNI01 */ .flags = IORESOURCE_IRQ, @@ -341,12 +331,7 @@ static struct platform_device tmu01_device = { }; static struct resource i2c0_resources[] = { - [0] = { - .name = "IIC0", - .start = 0xe6820000, - .end = 0xe6820425 - 1, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xe6820000, 0x426, "IIC0"), [1] = { .start = gic_spi(167), .end = gic_spi(170), @@ -355,12 +340,7 @@ static struct resource i2c0_resources[] = { }; static struct resource i2c1_resources[] = { - [0] = { - .name = "IIC1", - .start = 0xe6822000, - .end = 0xe6822425 - 1, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xe6822000, 0x426, "IIC1"), [1] = { .start = gic_spi(51), .end = gic_spi(54), @@ -369,12 +349,7 @@ static struct resource i2c1_resources[] = { }; static struct resource i2c2_resources[] = { - [0] = { - .name = "IIC2", - .start = 0xe6824000, - .end = 0xe6824425 - 1, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xe6824000, 0x426, "IIC2"), [1] = { .start = gic_spi(171), .end = gic_spi(174), @@ -383,12 +358,7 @@ static struct resource i2c2_resources[] = { }; static struct resource i2c3_resources[] = { - [0] = { - .name = "IIC3", - .start = 0xe6826000, - .end = 0xe6826425 - 1, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xe6826000, 0x426, "IIC3"), [1] = { .start = gic_spi(183), .end = gic_spi(186), @@ -397,12 +367,7 @@ static struct resource i2c3_resources[] = { }; static struct resource i2c4_resources[] = { - [0] = { - .name = "IIC4", - .start = 0xe6828000, - .end = 0xe6828425 - 1, - .flags = IORESOURCE_MEM, - }, + [0] = DEFINE_RES_MEM_NAMED(0xe6828000, 0x426, "IIC4"), [1] = { .start = gic_spi(187), .end = gic_spi(190), @@ -623,12 +588,7 @@ static struct sh_dmae_pdata sh73a0_dmae_platform_data = { }; static struct resource sh73a0_dmae_resources[] = { - { - /* Registers including DMAOR and channels including DMARSx */ - .start = 0xfe000020, - .end = 0xfe008a00 - 1, - .flags = IORESOURCE_MEM, - }, + DEFINE_RES_MEM(0xfe000020, 0x89e0), { .name = "error_irq", .start = gic_spi(129), @@ -727,18 +687,10 @@ static struct sh_dmae_pdata sh73a0_mpdma_platform_data = { /* Resource order important! */ static struct resource sh73a0_mpdma_resources[] = { - { - /* Channel registers and DMAOR */ - .start = 0xec618020, - .end = 0xec61828f, - .flags = IORESOURCE_MEM, - }, - { - /* DMARSx */ - .start = 0xec619000, - .end = 0xec61900b, - .flags = IORESOURCE_MEM, - }, + /* Channel registers and DMAOR */ + DEFINE_RES_MEM(0xec618020, 0x270), + /* DMARSx */ + DEFINE_RES_MEM(0xec619000, 0xc), { .name = "error_irq", .start = gic_spi(181), @@ -785,12 +737,7 @@ static struct platform_device pmu_device = { /* an IPMMU module for ICB */ static struct resource ipmmu_resources[] = { - [0] = { - .name = "IPMMU", - .start = 0xfe951000, - .end = 0xfe9510ff, - .flags = IORESOURCE_MEM, - }, + DEFINE_RES_MEM_NAMED(0xfe951000, 0x100, "IPMMU"), }; static const char * const ipmmu_dev_names[] = { -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] ARM: shmobile: marzen: keep local function as static 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman ` (3 preceding siblings ...) 2013-06-06 7:28 ` [PATCH 4/5] ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere Simon Horman @ 2013-06-06 7:28 ` Simon Horman 2013-06-06 7:39 ` [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:28 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> marzen_init_late() should be static Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/board-marzen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 9105285..d9c494e 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -349,7 +349,7 @@ static struct platform_device *marzen_late_devices[] __initdata = { &ohci1_device, }; -void __init marzen_init_late(void) +static void __init marzen_init_late(void) { /* get usb phy */ phy = usb_get_phy(USB_PHY_TYPE_USB2); -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman ` (4 preceding siblings ...) 2013-06-06 7:28 ` [PATCH 5/5] ARM: shmobile: marzen: keep local function as static Simon Horman @ 2013-06-06 7:39 ` Simon Horman 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2013-06-06 7:39 UTC (permalink / raw) To: linux-arm-kernel Apologies, I thought I had testes this but I have discovered a build problem in the soc branch relating to the absence of a clean-up patch. I will reshuffle this pull request and the one for soc and repost. On Thu, Jun 06, 2013 at 04:28:18PM +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-cleanup-for-v3.11 > > for you to fetch changes up to b9d02b5dc95bdbce73d0adceb1a3d20eb3068c8b: > > ARM: shmobile: marzen: keep local function as static (2013-06-06 14:14:13 +0900) > > ---------------------------------------------------------------- > Renesas ARM based SoC cleanups for v3.11 > > * marzen: Make local function static > * sh73a0: Use DEFINE_RES_MEM*() everywhere > * r8a7778: Correct model number > * Clean Up SH_CLK_SET_RATIO() and SH_FIXED_RATIO_CLK() macros > * r8a7740: Make private clock arrays static > > ---------------------------------------------------------------- > Kuninori Morimoto (2): > ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() > ARM: shmobile: marzen: keep local function as static > > Laurent Pinchart (1): > ARM: shmobile: r8a7740: Make private clock arrays static > > 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 | 2 +- > arch/arm/mach-shmobile/board-marzen.c | 2 +- > arch/arm/mach-shmobile/clock-r8a7740.c | 4 +- > arch/arm/mach-shmobile/include/mach/clock.h | 4 +- > arch/arm/mach-shmobile/setup-sh73a0.c | 79 +++++------------------------ > 5 files changed, 19 insertions(+), 72 deletions(-) > > -- > 1.8.2.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-06-06 7:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-06 7:28 [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 Simon Horman
2013-06-06 7:28 ` [PATCH 1/5] ARM: shmobile: r8a7740: Make private clock arrays static Simon Horman
2013-06-06 7:28 ` [PATCH 2/5] ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() Simon Horman
2013-06-06 7:28 ` [PATCH 3/5] ARM: shmobile: r8a7778: correct model name in Kconfig Simon Horman
2013-06-06 7:28 ` [PATCH 4/5] ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere Simon Horman
2013-06-06 7:28 ` [PATCH 5/5] ARM: shmobile: marzen: keep local function as static Simon Horman
2013-06-06 7:39 ` [GIT PULL 0/5] Renesas ARM based SoC cleanups for v3.11 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).