linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
@ 2013-10-08  9:05 Simon Horman
  2013-10-08  9:05 ` [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin Simon Horman
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Simon Horman @ 2013-10-08  9:05 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Kevin, Olof and Arnd,

please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
It is based on renesas-cleanup-for-v3.13 which you have previously pulled.


The following changes since commit cde214a890f81797a5eee94fffc89c1de21ed991:

  ARM: shmobile: r8a7790: Constify platform data and resources (2013-09-19 14:33:44 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13

for you to fetch changes up to 27113d63daac0aacaa26b1fabfc23391de4284f4:

  ARM: shmobile: lager: Constify platform data and resources (2013-09-30 16:33:17 +0900)

----------------------------------------------------------------
Second round of Renesas ARM based SoC cleanups for v3.13

* Constify platform data and resources in lager board code
* Clean up registration of VIN and sh_eth in r8a7778 SoC and
   bockw board code
* Make r8a7778_register_hspi() static in r8a7778 SoC code

----------------------------------------------------------------
Kuninori Morimoto (3):
      ARM: shmobile: r8a7778: cleanup registration of vin
      ARM: shmobile: r8a7778: cleanup registration of sh_eth
      ARM: shmobile: r8a7778: r8a7778_register_hspi() become static

Laurent Pinchart (1):
      ARM: shmobile: lager: Constify platform data and resources

 arch/arm/mach-shmobile/board-bockw.c          | 46 ++++++++++++++++++++----
 arch/arm/mach-shmobile/board-lager.c          | 14 ++++----
 arch/arm/mach-shmobile/include/mach/r8a7778.h |  3 --
 arch/arm/mach-shmobile/setup-r8a7778.c        | 50 +--------------------------
 4 files changed, 47 insertions(+), 66 deletions(-)

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
@ 2013-10-08  9:05 ` Simon Horman
  2013-10-08  9:05 ` [PATCH 2/4] ARM: shmobile: r8a7778: cleanup registration of sh_eth Simon Horman
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-10-08  9:05 UTC (permalink / raw)
  To: linux-arm-kernel

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

vin driver which needs platform data at the time of
registration is used from BockW only.
Now, ARM/shmobile aims to support DT,
and the C code base board support will be removed
if DT support is completed.
Current driver registration method which needs platform data
and which is not shared complicates codes.
This means legacy C code cleanup after DT supporting
will be more complicated
This patch registers it on board code as cleanup C code

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-bockw.c          | 32 ++++++++++++++++++++-----
 arch/arm/mach-shmobile/include/mach/r8a7778.h |  2 --
 arch/arm/mach-shmobile/setup-r8a7778.c        | 34 ---------------------------
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 6b9faf3..4b696ce 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -162,10 +162,6 @@ static struct sh_mmcif_plat_data sh_mmcif_plat __initdata = {
 			  MMC_CAP_NEEDS_POLL,
 };
 
-static struct rcar_vin_platform_data vin_platform_data __initdata = {
-	.flags	= RCAR_VIN_BT656,
-};
-
 /* In the default configuration both decoders reside on I2C bus 0 */
 #define BOCKW_CAMERA(idx)						\
 static struct i2c_board_info camera##idx##_info = {			\
@@ -181,6 +177,30 @@ static struct soc_camera_link iclink##idx##_ml86v7667 __initdata = {	\
 BOCKW_CAMERA(0);
 BOCKW_CAMERA(1);
 
+/* VIN */
+static struct rcar_vin_platform_data vin_platform_data __initdata = {
+	.flags	= RCAR_VIN_BT656,
+};
+
+#define R8A7778_VIN(idx)						\
+static struct resource vin##idx##_resources[] __initdata = {		\
+	DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),		\
+	DEFINE_RES_IRQ(gic_iid(0x5a)),					\
+};									\
+									\
+static struct platform_device_info vin##idx##_info __initdata = {	\
+	.parent		= &platform_bus,				\
+	.name		= "r8a7778-vin",				\
+	.id		= idx,						\
+	.res		= vin##idx##_resources,				\
+	.num_res	= ARRAY_SIZE(vin##idx##_resources),		\
+	.dma_mask	= DMA_BIT_MASK(32),				\
+	.data		= &vin_platform_data,				\
+	.size_data	= sizeof(vin_platform_data),			\
+}
+R8A7778_VIN(0);
+R8A7778_VIN(1);
+
 static const struct pinctrl_map bockw_pinctrl_map[] = {
 	/* Ether */
 	PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
@@ -236,10 +256,10 @@ static void __init bockw_init(void)
 	r8a7778_init_irq_extpin(1);
 	r8a7778_add_standard_devices();
 	r8a7778_add_ether_device(&ether_platform_data);
-	r8a7778_add_vin_device(0, &vin_platform_data);
+	platform_device_register_full(&vin0_info);
 	/* VIN1 has a pin conflict with Ether */
 	if (!IS_ENABLED(CONFIG_SH_ETH))
-		r8a7778_add_vin_device(1, &vin_platform_data);
+		platform_device_register_full(&vin1_info);
 	platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
 				      &iclink0_ml86v7667,
 				      sizeof(iclink0_ml86v7667));
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index adfcf51..9838608 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -24,8 +24,6 @@
 extern void r8a7778_add_standard_devices(void);
 extern void r8a7778_add_standard_devices_dt(void);
 extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
-extern void r8a7778_add_vin_device(int id,
-				   struct rcar_vin_platform_data *pdata);
 extern void r8a7778_add_dt_devices(void);
 
 extern void r8a7778_init_late(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 6a2657e..604cf36 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -281,40 +281,6 @@ void __init r8a7778_register_hspi(int id)
 		hspi_resources + (2 * id), 2);
 }
 
-/* VIN */
-#define R8A7778_VIN(idx)						\
-static struct resource vin##idx##_resources[] __initdata = {		\
-	DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),		\
-	DEFINE_RES_IRQ(gic_iid(0x5a)),					\
-};									\
-									\
-static struct platform_device_info vin##idx##_info __initdata = {	\
-	.parent		= &platform_bus,				\
-	.name		= "r8a7778-vin",				\
-	.id		= idx,						\
-	.res		= vin##idx##_resources,				\
-	.num_res	= ARRAY_SIZE(vin##idx##_resources),		\
-	.dma_mask	= DMA_BIT_MASK(32),				\
-}
-
-R8A7778_VIN(0);
-R8A7778_VIN(1);
-
-static struct platform_device_info *vin_info_table[] __initdata = {
-	&vin0_info,
-	&vin1_info,
-};
-
-void __init r8a7778_add_vin_device(int id, struct rcar_vin_platform_data *pdata)
-{
-	BUG_ON(id < 0 || id > 1);
-
-	vin_info_table[id]->data = pdata;
-	vin_info_table[id]->size_data = sizeof(*pdata);
-
-	platform_device_register_full(vin_info_table[id]);
-}
-
 void __init r8a7778_add_dt_devices(void)
 {
 	int i;
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: shmobile: r8a7778: cleanup registration of sh_eth
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
  2013-10-08  9:05 ` [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin Simon Horman
@ 2013-10-08  9:05 ` Simon Horman
  2013-10-08  9:05 ` [PATCH 3/4] ARM: shmobile: r8a7778: r8a7778_register_hspi() become static Simon Horman
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-10-08  9:05 UTC (permalink / raw)
  To: linux-arm-kernel

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

sh_eth driver which needs platform data at the time of
registration is used from BockW only.
Now, ARM/shmobile aims to support DT,
and the C code base board support will be removed
if DT support is completed.
Current driver registration method which needs platform data
and which is not shared complicates codes.
This means legacy C code cleanup after DT supporting
will be more complicated
This patch registers it on board code as cleanup C code

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-bockw.c          | 14 +++++++++++++-
 arch/arm/mach-shmobile/include/mach/r8a7778.h |  1 -
 arch/arm/mach-shmobile/setup-r8a7778.c        | 14 --------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 4b696ce..f2bf61b 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -101,6 +101,12 @@ static struct resource sdhi0_resources[] __initdata = {
 	DEFINE_RES_IRQ(gic_iid(0x77)),
 };
 
+/* Ether */
+static struct resource ether_resources[] __initdata = {
+	DEFINE_RES_MEM(0xfde00000, 0x400),
+	DEFINE_RES_IRQ(gic_iid(0x89)),
+};
+
 static struct sh_eth_plat_data ether_platform_data __initdata = {
 	.phy		= 0x01,
 	.edmac_endian	= EDMAC_LITTLE_ENDIAN,
@@ -255,7 +261,13 @@ static void __init bockw_init(void)
 	r8a7778_clock_init();
 	r8a7778_init_irq_extpin(1);
 	r8a7778_add_standard_devices();
-	r8a7778_add_ether_device(&ether_platform_data);
+
+	platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
+					  ether_resources,
+					  ARRAY_SIZE(ether_resources),
+					  &ether_platform_data,
+					  sizeof(ether_platform_data));
+
 	platform_device_register_full(&vin0_info);
 	/* VIN1 has a pin conflict with Ether */
 	if (!IS_ENABLED(CONFIG_SH_ETH))
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index 9838608..48933def 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -23,7 +23,6 @@
 
 extern void r8a7778_add_standard_devices(void);
 extern void r8a7778_add_standard_devices_dt(void);
-extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
 extern void r8a7778_add_dt_devices(void);
 
 extern void r8a7778_init_late(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 604cf36..f5e15c9 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -174,20 +174,6 @@ static struct platform_device_info hci##_info __initdata = {	\
 USB_PLATFORM_INFO(ehci);
 USB_PLATFORM_INFO(ohci);
 
-/* Ether */
-static struct resource ether_resources[] __initdata = {
-	DEFINE_RES_MEM(0xfde00000, 0x400),
-	DEFINE_RES_IRQ(gic_iid(0x89)),
-};
-
-void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata)
-{
-	platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
-					  ether_resources,
-					  ARRAY_SIZE(ether_resources),
-					  pdata, sizeof(*pdata));
-}
-
 /* PFC/GPIO */
 static struct resource pfc_resources[] __initdata = {
 	DEFINE_RES_MEM(0xfffc0000, 0x118),
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: shmobile: r8a7778: r8a7778_register_hspi() become static
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
  2013-10-08  9:05 ` [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin Simon Horman
  2013-10-08  9:05 ` [PATCH 2/4] ARM: shmobile: r8a7778: cleanup registration of sh_eth Simon Horman
@ 2013-10-08  9:05 ` Simon Horman
  2013-10-08  9:05 ` [PATCH 4/4] ARM: shmobile: lager: Constify platform data and resources Simon Horman
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-10-08  9:05 UTC (permalink / raw)
  To: linux-arm-kernel

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

r8a7778_register_hspi() used only from setup-r8a7778.c
it can be static

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-r8a7778.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index f5e15c9..468ee65 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -258,7 +258,7 @@ static struct resource hspi_resources[] __initdata = {
 	DEFINE_RES_IRQ(gic_iid(0x75)),
 };
 
-void __init r8a7778_register_hspi(int id)
+static void __init r8a7778_register_hspi(int id)
 {
 	BUG_ON(id < 0 || id > 2);
 
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: shmobile: lager: Constify platform data and resources
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
                   ` (2 preceding siblings ...)
  2013-10-08  9:05 ` [PATCH 3/4] ARM: shmobile: r8a7778: r8a7778_register_hspi() become static Simon Horman
@ 2013-10-08  9:05 ` Simon Horman
  2013-10-09  4:53 ` [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
  2013-10-10 22:19 ` Kevin Hilman
  5 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-10-08  9:05 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Platform data and resources for Lager devices are kmemdup()ed when the
corresponding devices are registered and can thus be declared as const.
Do so.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 4047fac..afd5137 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -55,7 +55,7 @@ static struct gpio_led lager_leds[] = {
 	},
 };
 
-static __initdata struct gpio_led_platform_data lager_leds_pdata = {
+static const struct gpio_led_platform_data lager_leds_pdata __initconst = {
 	.leds		= lager_leds,
 	.num_leds	= ARRAY_SIZE(lager_leds),
 };
@@ -71,7 +71,7 @@ static struct gpio_keys_button gpio_buttons[] = {
 	GPIO_KEY(KEY_1,		RCAR_GP_PIN(1, 14),	"SW2-pin1"),
 };
 
-static __initdata struct gpio_keys_platform_data lager_keys_pdata = {
+static const struct gpio_keys_platform_data lager_keys_pdata __initconst = {
 	.buttons	= gpio_buttons,
 	.nbuttons	= ARRAY_SIZE(gpio_buttons),
 };
@@ -83,24 +83,24 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] =
 };
 
 /* MMCIF */
-static struct sh_mmcif_plat_data mmcif1_pdata __initdata = {
+static const struct sh_mmcif_plat_data mmcif1_pdata __initconst = {
 	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
 };
 
-static struct resource mmcif1_resources[] __initdata = {
+static const struct resource mmcif1_resources[] __initconst = {
 	DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),
 	DEFINE_RES_IRQ(gic_spi(170)),
 };
 
 /* Ether */
-static struct sh_eth_plat_data ether_pdata __initdata = {
+static const struct sh_eth_plat_data ether_pdata __initconst = {
 	.phy			= 0x1,
 	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
 	.phy_interface		= PHY_INTERFACE_MODE_RMII,
 	.ether_link_active_low	= 1,
 };
 
-static struct resource ether_resources[] __initdata = {
+static const struct resource ether_resources[] __initconst = {
 	DEFINE_RES_MEM(0xee700000, 0x400),
 	DEFINE_RES_IRQ(gic_spi(162)),
 };
@@ -155,7 +155,7 @@ static void __init lager_add_standard_devices(void)
 					  &ether_pdata, sizeof(ether_pdata));
 }
 
-static const char *lager_boards_compat_dt[] __initdata = {
+static const char * const lager_boards_compat_dt[] __initconst = {
 	"renesas,lager",
 	NULL,
 };
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
                   ` (3 preceding siblings ...)
  2013-10-08  9:05 ` [PATCH 4/4] ARM: shmobile: lager: Constify platform data and resources Simon Horman
@ 2013-10-09  4:53 ` Simon Horman
  2013-10-10 22:02   ` Kevin Hilman
  2013-10-10 22:19 ` Kevin Hilman
  5 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2013-10-09  4:53 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote:
> Hi Kevin, Olof and Arnd,
> 
> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.

This pull-request causes some conflicts in
arch/arm/mach-shmobile/board-bockw.c. In general the resolution
strategy should be to take everything.

A sample merge is provided in the renesas-next-20131008 tag
of my renesas tree.

> 
> 
> The following changes since commit cde214a890f81797a5eee94fffc89c1de21ed991:
> 
>   ARM: shmobile: r8a7790: Constify platform data and resources (2013-09-19 14:33:44 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13
> 
> for you to fetch changes up to 27113d63daac0aacaa26b1fabfc23391de4284f4:
> 
>   ARM: shmobile: lager: Constify platform data and resources (2013-09-30 16:33:17 +0900)
> 
> ----------------------------------------------------------------
> Second round of Renesas ARM based SoC cleanups for v3.13
> 
> * Constify platform data and resources in lager board code
> * Clean up registration of VIN and sh_eth in r8a7778 SoC and
>    bockw board code
> * Make r8a7778_register_hspi() static in r8a7778 SoC code
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (3):
>       ARM: shmobile: r8a7778: cleanup registration of vin
>       ARM: shmobile: r8a7778: cleanup registration of sh_eth
>       ARM: shmobile: r8a7778: r8a7778_register_hspi() become static
> 
> Laurent Pinchart (1):
>       ARM: shmobile: lager: Constify platform data and resources
> 
>  arch/arm/mach-shmobile/board-bockw.c          | 46 ++++++++++++++++++++----
>  arch/arm/mach-shmobile/board-lager.c          | 14 ++++----
>  arch/arm/mach-shmobile/include/mach/r8a7778.h |  3 --
>  arch/arm/mach-shmobile/setup-r8a7778.c        | 50 +--------------------------
>  4 files changed, 47 insertions(+), 66 deletions(-)
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
  2013-10-09  4:53 ` [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
@ 2013-10-10 22:02   ` Kevin Hilman
  2013-10-10 22:14     ` Kevin Hilman
  0 siblings, 1 reply; 9+ messages in thread
From: Kevin Hilman @ 2013-10-10 22:02 UTC (permalink / raw)
  To: linux-arm-kernel

Simon Horman <horms@verge.net.au> writes:

> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote:
>> Hi Kevin, Olof and Arnd,
>> 
>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.
>
> This pull-request causes some conflicts in
> arch/arm/mach-shmobile/board-bockw.c. In general the resolution
> strategy should be to take everything.

Thanks for the heads up.  I assume you meant board-lager.c though,
right?  That's where I saw the conflict.

Kevin

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
  2013-10-10 22:02   ` Kevin Hilman
@ 2013-10-10 22:14     ` Kevin Hilman
  0 siblings, 0 replies; 9+ messages in thread
From: Kevin Hilman @ 2013-10-10 22:14 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Oct 10, 2013 at 3:02 PM, Kevin Hilman <khilman@linaro.org> wrote:
> Simon Horman <horms@verge.net.au> writes:
>
>> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote:
>>> Hi Kevin, Olof and Arnd,
>>>
>>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
>>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.
>>
>> This pull-request causes some conflicts in
>> arch/arm/mach-shmobile/board-bockw.c. In general the resolution
>> strategy should be to take everything.
>
> Thanks for the heads up.  I assume you meant board-lager.c though,
> right?  That's where I saw the conflict.

Nevermind, I see the conflict you were referring to now.

The one I found was a conflict between your first cleanup tag and this
one.  Feel free to base subsequent cleanup branches on the previous
ones if there are dependencies/conflicts like this.

Kevin

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
  2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
                   ` (4 preceding siblings ...)
  2013-10-09  4:53 ` [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
@ 2013-10-10 22:19 ` Kevin Hilman
  5 siblings, 0 replies; 9+ messages in thread
From: Kevin Hilman @ 2013-10-10 22:19 UTC (permalink / raw)
  To: linux-arm-kernel

Simon Horman <horms+renesas@verge.net.au> writes:

> Hi Kevin, Olof and Arnd,
>
> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.
>
>
> The following changes since commit cde214a890f81797a5eee94fffc89c1de21ed991:
>
>   ARM: shmobile: r8a7790: Constify platform data and resources (2013-09-19 14:33:44 -0700)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.13
>
> for you to fetch changes up to 27113d63daac0aacaa26b1fabfc23391de4284f4:
>
>   ARM: shmobile: lager: Constify platform data and resources (2013-09-30 16:33:17 +0900)
>
> ----------------------------------------------------------------
> Second round of Renesas ARM based SoC cleanups for v3.13
>
> * Constify platform data and resources in lager board code
> * Clean up registration of VIN and sh_eth in r8a7778 SoC and
>    bockw board code
> * Make r8a7778_register_hspi() static in r8a7778 SoC code

Pulled into next/cleanup.

Thanks,

Kevin

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-10-10 22:19 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-08  9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
2013-10-08  9:05 ` [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin Simon Horman
2013-10-08  9:05 ` [PATCH 2/4] ARM: shmobile: r8a7778: cleanup registration of sh_eth Simon Horman
2013-10-08  9:05 ` [PATCH 3/4] ARM: shmobile: r8a7778: r8a7778_register_hspi() become static Simon Horman
2013-10-08  9:05 ` [PATCH 4/4] ARM: shmobile: lager: Constify platform data and resources Simon Horman
2013-10-09  4:53 ` [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
2013-10-10 22:02   ` Kevin Hilman
2013-10-10 22:14     ` Kevin Hilman
2013-10-10 22:19 ` Kevin Hilman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).