Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b6250e7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-boards-cleanup-for-v3.12' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 70ba4d28 8c8881b5

arch/arm/mach-shmobile/board-ape6evm.c

+9 −9
Original line number Diff line number Diff line
@@ -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"),

arch/arm/mach-shmobile/board-lager.c

+2 −2
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = 
};



/* MMCIF */

static struct sh_mmcif_plat_data mmcif1_pdata = {

static struct sh_mmcif_plat_data mmcif1_pdata __initdata = {

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

};



static struct resource mmcif1_resources[] = {

static struct resource mmcif1_resources[] __initdata = {

	DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),

	DEFINE_RES_IRQ(gic_spi(170)),

};