[GIT PULL 0/2] Renesas ARM based SoC boards cleanups for v3.12

[GIT PULL 0/2] Renesas ARM based SoC boards cleanups for v3.12

[Simon Horman]

Hi Olof, Hi Arnd,

please consider these Renesas ARM based SoC boards cleanups for v3.12.

This pull-request is based on renesas-boards-for-v3.12,
which I have previously sent a pull-request for.

I have separated these cleanups from those that I included
in renesas-cleanup3-for-v3.12 as there are different dependencies
involved and this approach seemed simpler somehow.


The following changes since commit f79d68da510bf1b95beff4d556b78d06801f11dc:

  ARM: shmobile: ape6evm: add SDHI interfaces (2013-07-25 14:46:38 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-cleanup-for-v3.12

for you to fetch changes up to 8c8881b50691e17864cc54e5824b140e62fc2035:

  ARM: shmobile: lager: add missing __initdata (2013-08-06 09:53:56 +0900)

----------------------------------------------------------------
Renesas ARM based SoC boards cleanups for v3.12

* Add __initdata annotations to lager board
* Add __initconst annotations to ape6evm board

----------------------------------------------------------------
Guennadi Liakhovetski (1):
      ARM: shmobile: ape6evm: add "__initconst" annotations where needed

Kuninori Morimoto (1):
      ARM: shmobile: lager: add missing __initdata

 arch/arm/mach-shmobile/board-ape6evm.c | 18 +++++++++---------
 arch/arm/mach-shmobile/board-lager.c   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

[GIT PULL 1/2] ARM: shmobile: ape6evm: add "__initconst" annotations where needed

[Simon Horman]

From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

This patch adds __initconst markers to the platform data and resources,
used on ape6evm as parameters to platform_device_register_resndata().
The data is duplicated inside that function, therefore original data
can be discarded after initialisation is completed.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index ccf8b04..c5e6cba 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -44,7 +44,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 */
@@ -52,7 +52,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,
@@ -73,39 +73,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"),
-- 
1.8.3.2

[GIT PULL 2/2] ARM: shmobile: lager: add missing __initdata

[Simon Horman]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch adds missing __initdata to driver data/resource
which are used from platform_device_register_xxx()

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-lager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 3c67b2a..9489314 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -82,11 +82,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)),
 };
-- 
1.8.3.2

[GIT PULL 0/2] Renesas ARM based SoC boards cleanups for v3.12

[Olof Johansson]

On Wed, Aug 07, 2013 at 01:36:37PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider these Renesas ARM based SoC boards cleanups for v3.12.
> 
> This pull-request is based on renesas-boards-for-v3.12,
> which I have previously sent a pull-request for.
> 
> I have separated these cleanups from those that I included
> in renesas-cleanup3-for-v3.12 as there are different dependencies
> involved and this approach seemed simpler somehow.
> 
> 
> The following changes since commit f79d68da510bf1b95beff4d556b78d06801f11dc:
> 
>   ARM: shmobile: ape6evm: add SDHI interfaces (2013-07-25 14:46:38 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-cleanup-for-v3.12

Pulled, thanks. FWIW, this could have been baked into boards2.


-Olof

[GIT PULL 0/2] Renesas ARM based SoC boards cleanups for v3.12

[Simon Horman]

On Wed, Aug 14, 2013 at 01:12:42AM -0700, Olof Johansson wrote:
> On Wed, Aug 07, 2013 at 01:36:37PM +0900, Simon Horman wrote:
> > Hi Olof, Hi Arnd,
> > 
> > please consider these Renesas ARM based SoC boards cleanups for v3.12.
> > 
> > This pull-request is based on renesas-boards-for-v3.12,
> > which I have previously sent a pull-request for.
> > 
> > I have separated these cleanups from those that I included
> > in renesas-cleanup3-for-v3.12 as there are different dependencies
> > involved and this approach seemed simpler somehow.
> > 
> > 
> > The following changes since commit f79d68da510bf1b95beff4d556b78d06801f11dc:
> > 
> >   ARM: shmobile: ape6evm: add SDHI interfaces (2013-07-25 14:46:38 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-cleanup-for-v3.12
> 
> Pulled, thanks. FWIW, this could have been baked into boards2.

Thanks. To be honest I am rather unclear on when something should go in a
cleanup branch and when it shouldn't.