| From aa390bb0217548342ce6262e2d0e6c11a73360a5 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 12 Jun 2013 02:03:59 +0000 |
| Subject: ARM: shmobile: r8a7790: add __initdata on resource and device data |
| |
| 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> |
| (cherry picked from commit f9094c526bca3cc50ef7d409c22976fa0f47bbba) |
| 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 b461d934..196bd732 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.8.4.3.gca3854a |
| |