diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-14 10:12:07 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-14 10:12:07 +0200 |
| commit | 3b6250e707d8092236f629443d722be33e1b4bf2 (patch) | |
| tree | be8fbc8d423534ab66b7cc776f9464ae731b69f7 /arch/arm/mach-shmobile/board-ape6evm.c | |
| parent | Merge tag 'renesas-boards2-for-v3.12' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: shmobile: lager: add missing __initdata (diff) | |
| download | linux-3b6250e707d8092236f629443d722be33e1b4bf2.tar.xz linux-3b6250e707d8092236f629443d722be33e1b4bf2.zip | |
Merge tag 'renesas-boards-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Renesas ARM based SoC boards cleanups for v3.12
* Add __initdata annotations to lager board
* Add __initconst annotations to ape6evm board
* tag 'renesas-boards-cleanup-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: lager: add missing __initdata
ARM: shmobile: ape6evm: add "__initconst" annotations where needed
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ape6evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ape6evm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index db97460665d5..38c6c733fabf 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -98,7 +98,7 @@ static struct regulator_consumer_supply dummy_supplies[] = { }; /* SMSC LAN9220 */ -static const struct resource lan9220_res[] = { +static const struct resource lan9220_res[] __initconst = { DEFINE_RES_MEM(0x08000000, 0x1000), { .start = irq_pin(40), /* IRQ40 */ @@ -106,7 +106,7 @@ static const struct resource lan9220_res[] = { }, }; -static const struct smsc911x_platform_config lan9220_data = { +static const struct smsc911x_platform_config lan9220_data __initconst = { .flags = SMSC911X_USE_32BIT, .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL, .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, @@ -127,39 +127,39 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = }; /* MMCIF */ -static struct sh_mmcif_plat_data mmcif0_pdata = { +static const struct sh_mmcif_plat_data mmcif0_pdata __initconst = { .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, }; -static struct resource mmcif0_resources[] = { +static const struct resource mmcif0_resources[] __initconst = { DEFINE_RES_MEM_NAMED(0xee200000, 0x100, "MMCIF0"), DEFINE_RES_IRQ(gic_spi(169)), }; /* SDHI0 */ -static struct sh_mobile_sdhi_info sdhi0_pdata = { +static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = { .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, }; -static struct resource sdhi0_resources[] = { +static const struct resource sdhi0_resources[] __initconst = { DEFINE_RES_MEM_NAMED(0xee100000, 0x100, "SDHI0"), DEFINE_RES_IRQ(gic_spi(165)), }; /* SDHI1 */ -static struct sh_mobile_sdhi_info sdhi1_pdata = { +static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = { .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL, }; -static struct resource sdhi1_resources[] = { +static const struct resource sdhi1_resources[] __initconst = { DEFINE_RES_MEM_NAMED(0xee120000, 0x100, "SDHI1"), DEFINE_RES_IRQ(gic_spi(166)), }; -static const struct pinctrl_map ape6evm_pinctrl_map[] = { +static const struct pinctrl_map ape6evm_pinctrl_map[] __initconst = { /* SCIFA0 console */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", "scifa0_data", "scifa0"), |