* [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11
@ 2013-06-17 6:54 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-06-17 6:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
This small pull request is based on a merge of
renesas-soc-for-v3.11 and renesas-pinmux-for-v3.11 both
of which you have previously pulled. The reason for this base is to provide
all the code that the one patch in this request adds annotations to.
The following changes since commit 12dd9752512449f0336b7d64df3871145a28a2fe:
Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup (2013-06-13 14:45:20 +0900)
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 f9094c526bca3cc50ef7d409c22976fa0f47bbba:
ARM: shmobile: r8a7790: add __initdata on resource and device data (2013-06-13 14:47:34 +0900)
----------------------------------------------------------------
Renesas ARM based SoC cleanups for v3.11
__initdata annotations for the r8a7790 SoC by Morimoto-san.
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: r8a7790: add __initdata on resource and device data
arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11
@ 2013-06-17 6:54 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-06-17 6:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
This small pull request is based on a merge of
renesas-soc-for-v3.11 and renesas-pinmux-for-v3.11 both
of which you have previously pulled. The reason for this base is to provide
all the code that the one patch in this request adds annotations to.
The following changes since commit 12dd9752512449f0336b7d64df3871145a28a2fe:
Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup (2013-06-13 14:45:20 +0900)
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 f9094c526bca3cc50ef7d409c22976fa0f47bbba:
ARM: shmobile: r8a7790: add __initdata on resource and device data (2013-06-13 14:47:34 +0900)
----------------------------------------------------------------
Renesas ARM based SoC cleanups for v3.11
__initdata annotations for the r8a7790 SoC by Morimoto-san.
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: r8a7790: add __initdata on resource and device data
arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: shmobile: r8a7790: add __initdata on resource and device data
2013-06-17 6:54 ` Simon Horman
@ 2013-06-17 6:54 ` Simon Horman
-1 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-06-17 6:54 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
These data will be kmemdup()'ed on
platform_device_add_resources() and platform_device_add_data()
This patch removed "const" to avoid section type conflict
with r8a7790_boards_compat_dt
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index b461d93..196bd73 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -30,17 +30,17 @@
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
-static const struct resource pfc_resources[] = {
+static struct resource pfc_resources[] __initdata = {
DEFINE_RES_MEM(0xe6060000, 0x250),
};
#define R8A7790_GPIO(idx) \
-static struct resource r8a7790_gpio##idx##_resources[] = { \
+static struct resource r8a7790_gpio##idx##_resources[] __initdata = { \
DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50), \
DEFINE_RES_IRQ(gic_spi(4 + (idx))), \
}; \
\
-static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data = { \
+static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data __initdata = { \
.gpio_base = 32 * (idx), \
.irq_base = 0, \
.number_of_pins = 32, \
@@ -103,7 +103,7 @@ void __init r8a7790_pinmux_init(void)
enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1 };
-static const struct plat_sci_port scif[] = {
+static struct plat_sci_port scif[] __initdata = {
SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */
@@ -120,11 +120,11 @@ static inline void r8a7790_register_scif(int idx)
sizeof(struct plat_sci_port));
}
-static struct renesas_irqc_config irqc0_data = {
+static struct renesas_irqc_config irqc0_data __initdata = {
.irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
};
-static struct resource irqc0_resources[] = {
+static struct resource irqc0_resources[] __initdata = {
DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */
DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */
DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: shmobile: r8a7790: add __initdata on resource and device data
@ 2013-06-17 6:54 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-06-17 6:54 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
These data will be kmemdup()'ed on
platform_device_add_resources() and platform_device_add_data()
This patch removed "const" to avoid section type conflict
with r8a7790_boards_compat_dt
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index b461d93..196bd73 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -30,17 +30,17 @@
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
-static const struct resource pfc_resources[] = {
+static struct resource pfc_resources[] __initdata = {
DEFINE_RES_MEM(0xe6060000, 0x250),
};
#define R8A7790_GPIO(idx) \
-static struct resource r8a7790_gpio##idx##_resources[] = { \
+static struct resource r8a7790_gpio##idx##_resources[] __initdata = { \
DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50), \
DEFINE_RES_IRQ(gic_spi(4 + (idx))), \
}; \
\
-static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data = { \
+static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data __initdata = { \
.gpio_base = 32 * (idx), \
.irq_base = 0, \
.number_of_pins = 32, \
@@ -103,7 +103,7 @@ void __init r8a7790_pinmux_init(void)
enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1 };
-static const struct plat_sci_port scif[] = {
+static struct plat_sci_port scif[] __initdata = {
SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */
@@ -120,11 +120,11 @@ static inline void r8a7790_register_scif(int idx)
sizeof(struct plat_sci_port));
}
-static struct renesas_irqc_config irqc0_data = {
+static struct renesas_irqc_config irqc0_data __initdata = {
.irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
};
-static struct resource irqc0_resources[] = {
+static struct resource irqc0_resources[] __initdata = {
DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */
DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */
DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11
2013-06-17 6:54 ` Simon Horman
@ 2013-06-21 12:58 ` Arnd Bergmann
-1 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2013-06-21 12:58 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 17 June 2013, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> This small pull request is based on a merge of
> renesas-soc-for-v3.11 and renesas-pinmux-for-v3.11 both
> of which you have previously pulled. The reason for this base is to provide
> all the code that the one patch in this request adds annotations to.
>
> The following changes since commit 12dd9752512449f0336b7d64df3871145a28a2fe:
As discussed on IRC, I started a next/late branch now and pulled this
into it, since the dependencies don't allow putting it into any
other branch easily.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11
@ 2013-06-21 12:58 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2013-06-21 12:58 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 17 June 2013, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> This small pull request is based on a merge of
> renesas-soc-for-v3.11 and renesas-pinmux-for-v3.11 both
> of which you have previously pulled. The reason for this base is to provide
> all the code that the one patch in this request adds annotations to.
>
> The following changes since commit 12dd9752512449f0336b7d64df3871145a28a2fe:
As discussed on IRC, I started a next/late branch now and pulled this
into it, since the dependencies don't allow putting it into any
other branch easily.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-21 12:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-17 6:54 [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11 Simon Horman
2013-06-17 6:54 ` Simon Horman
2013-06-17 6:54 ` [PATCH] ARM: shmobile: r8a7790: add __initdata on resource and device data Simon Horman
2013-06-17 6:54 ` Simon Horman
2013-06-21 12:58 ` [GIT PULL v2 0/1] Renesas ARM based SoC cleanups for v3.11 Arnd Bergmann
2013-06-21 12:58 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.