[GIT PULL 0/3] Second round of Renesas ARM-based SoC board updates for v3.12

[GIT PULL 0/3] Second round of Renesas ARM-based SoC board updates for v3.12

[Simon Horman]

Hi Olof, Hi Arnd,

please consider this second round of Renesas ARM-based SoC board updates
for v3.12.

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


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-boards2-for-v3.12

for you to fetch changes up to 4901e136aa5c35873701156c4c0af5b3c2c8faee:

  ARM: shmobile: lager: enable Ether (2013-08-06 18:18:53 +0900)

----------------------------------------------------------------
Second round of Renesas ARM-based SoC board updates for v3.12

* Enable ether on lager board
* Enable GPIO LEDs and switches on ape6evm board

----------------------------------------------------------------
Simon Horman (3):
      ARM: shmobile: ape6evm: support GPIO switches
      ARM: shmobile: ape6evm: Add GPIO LEDs
      ARM: shmobile: lager: enable Ether

 arch/arm/mach-shmobile/board-ape6evm.c | 60 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-shmobile/board-lager.c   | 29 ++++++++++++++++
 2 files changed, 89 insertions(+)

[GIT PULL 1/3] ARM: shmobile: ape6evm: support GPIO switches

[Simon Horman]

The ape6evm board has switches S16 - S23 wired up to GPIO pins.
This patch allows access to those pins as gpio-keys.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index ccf8b04..677752c 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -19,6 +19,8 @@
  */
 
 #include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/mfd/tmio.h>
@@ -37,6 +39,24 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+/* GPIO KEY */
+#define GPIO_KEY(c, g, d, ...) \
+	{ .code = c, .gpio = g, .desc = d, .active_low = 1 }
+
+static struct gpio_keys_button gpio_buttons[] = {
+	GPIO_KEY(KEY_0,			324,	"S16"),
+	GPIO_KEY(KEY_MENU,		325,	"S17"),
+	GPIO_KEY(KEY_HOME,		326,	"S18"),
+	GPIO_KEY(KEY_BACK,		327,	"S19"),
+	GPIO_KEY(KEY_VOLUMEUP,		328,	"S20"),
+	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
+};
+
+static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+	.buttons	= gpio_buttons,
+	.nbuttons	= ARRAY_SIZE(gpio_buttons),
+};
+
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
 	REGULATOR_SUPPLY("vddvario", "smsc911x"),
@@ -172,6 +192,9 @@ static void __init ape6evm_add_standard_devices(void)
 	platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
 					  sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
 					  &sdhi1_pdata, sizeof(sdhi1_pdata));
+	platform_device_register_data(&platform_bus, "gpio-keys", -1,
+				      &ape6evm_keys_pdata,
+				      sizeof(ape6evm_keys_pdata));
 }
 
 static const char *ape6evm_boards_compat_dt[] __initdata = {
-- 
1.8.3.2

[GIT PULL 2/3] ARM: shmobile: ape6evm: Add GPIO LEDs

[Simon Horman]

The board has 6 LEDs connected to GPIOs. Add a led-gpio device to
support them.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 677752c..db97460 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -39,6 +39,40 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+/* LEDS */
+static struct gpio_led ape6evm_leds[] = {
+	{
+		.name		= "gnss-en",
+		.gpio		= 28,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	}, {
+		.name		= "nfc-nrst",
+		.gpio		= 126,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	}, {
+		.name		= "gnss-nrst",
+		.gpio		= 132,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	}, {
+		.name		= "bt-wakeup",
+		.gpio		= 232,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	}, {
+		.name		= "strobe",
+		.gpio		= 250,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	}, {
+		.name		= "bbresetout",
+		.gpio		= 288,
+		.default_state	= LEDS_GPIO_DEFSTATE_OFF,
+	},
+};
+
+static __initdata struct gpio_led_platform_data ape6evm_leds_pdata = {
+	.leds		= ape6evm_leds,
+	.num_leds	= ARRAY_SIZE(ape6evm_leds),
+};
+
 /* GPIO KEY */
 #define GPIO_KEY(c, g, d, ...) \
 	{ .code = c, .gpio = g, .desc = d, .active_low = 1 }
@@ -195,6 +229,9 @@ static void __init ape6evm_add_standard_devices(void)
 	platform_device_register_data(&platform_bus, "gpio-keys", -1,
 				      &ape6evm_keys_pdata,
 				      sizeof(ape6evm_keys_pdata));
+	platform_device_register_data(&platform_bus, "leds-gpio", -1,
+				      &ape6evm_leds_pdata,
+				      sizeof(ape6evm_leds_pdata));
 }
 
 static const char *ape6evm_boards_compat_dt[] __initdata = {
-- 
1.8.3.2

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

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 | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 3c67b2a..7915153 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -31,6 +31,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
+#include <linux/sh_eth.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7790.h>
@@ -91,6 +92,20 @@ static struct resource mmcif1_resources[] = {
 	DEFINE_RES_IRQ(gic_spi(170)),
 };
 
+/* Ether */
+static struct sh_eth_plat_data ether_pdata __initdata = {
+	.phy			= 0x1,
+	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
+	.register_type		= SH_ETH_REG_FAST_RCAR,
+	.phy_interface		= PHY_INTERFACE_MODE_RMII,
+	.ether_link_active_low	= 1,
+};
+
+static struct resource ether_resources[] __initdata = {
+	DEFINE_RES_MEM(0xee700000, 0x400),
+	DEFINE_RES_IRQ(gic_spi(162)),
+};
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
 	/* SCIF0 (CN19: DEBUG SERIAL0) */
 	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
@@ -103,6 +118,15 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
 				  "mmc1_data8", "mmc1"),
 	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
 				  "mmc1_ctrl", "mmc1"),
+	/* Ether */
+	PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+				  "eth_link", "eth"),
+	PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+				  "eth_mdio", "eth"),
+	PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+				  "eth_rmii", "eth"),
+	PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+				  "intc_irq0", "intc"),
 };
 
 static void __init lager_add_standard_devices(void)
@@ -125,6 +149,11 @@ static void __init lager_add_standard_devices(void)
 	platform_device_register_resndata(&platform_bus, "sh_mmcif", 1,
 					  mmcif1_resources, ARRAY_SIZE(mmcif1_resources),
 					  &mmcif1_pdata, sizeof(mmcif1_pdata));
+
+	platform_device_register_resndata(&platform_bus, "r8a7790-ether", -1,
+					  ether_resources,
+					  ARRAY_SIZE(ether_resources),
+					  &ether_pdata, sizeof(ether_pdata));
 }
 
 static const char *lager_boards_compat_dt[] __initdata = {
-- 
1.8.3.2

[GIT PULL 0/3] Second round of Renesas ARM-based SoC board updates for v3.12

[Olof Johansson]

On Wed, Aug 07, 2013 at 01:30:17PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider this second round of Renesas ARM-based SoC board updates
> for v3.12.
> 
> This pull-request is based on renesas-boards-for-v3.12, which I have
> previously sent a pull-request for.
> 
> 
> 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-boards2-for-v3.12


Pulled, thanks.


-Olof

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Kevin Hilman]

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

> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

This one is triggering a new build failure in -next:

arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)

> +/* Ether */
> +static struct sh_eth_plat_data ether_pdata __initdata = {
> +	.phy			= 0x1,
> +	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
> +	.register_type		= SH_ETH_REG_FAST_RCAR,

and it looks to be because this board is trying to use the register_type
field which was removed by:

commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date:   Sun Aug 18 03:13:26 2013 +0400

    sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
    
    Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
    used by the driver anymore, it's time to remove it and  its initializers from
    the SH platform code. Also  move *enum* declaring values for this  field from
    <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
    by the driver itself  now...
    
    Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Sergei Shtylyov]

Hello.

On 08/21/2013 08:01 PM, Kevin Hilman wrote:

>> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

> This one is triggering a new build failure in -next:

> arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)

>> +/* Ether */
>> +static struct sh_eth_plat_data ether_pdata __initdata = {
>> +	.phy			= 0x1,
>> +	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
>> +	.register_type		= SH_ETH_REG_FAST_RCAR,

> and it looks to be because this board is trying to use the register_type
> field which was removed by:

> commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Date:   Sun Aug 18 03:13:26 2013 +0400
>
>      sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
>
>      Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
>      used by the driver anymore, it's time to remove it and  its initializers from
>      the SH platform code. Also  move *enum* declaring values for this  field from
>      <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
>      by the driver itself  now...
>
>      Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>      Signed-off-by: David S. Miller <davem@davemloft.net>

    Looks like in this case I had no choice since R8A7790 support for the 
'sh_eth' driver will be added in 3.12 only, so if I merged these patches thru 
the shmobile tree, we'd have gotten an error in the driver...
    I guess it's too early to fix this in any particular tree except for 
linux-next itself... let me know what I can do.

WBR, Sergei

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 08/21/2013 08:01 PM, Kevin Hilman wrote:
> 
> >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> >This one is triggering a new build failure in -next:
> 
> >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
> 
> >>+/* Ether */
> >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> >>+	.phy			= 0x1,
> >>+	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
> >>+	.register_type		= SH_ETH_REG_FAST_RCAR,
> 
> >and it looks to be because this board is trying to use the register_type
> >field which was removed by:
> 
> >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >Date:   Sun Aug 18 03:13:26 2013 +0400
> >
> >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> >
> >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> >     used by the driver anymore, it's time to remove it and  its initializers from
> >     the SH platform code. Also  move *enum* declaring values for this  field from
> >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
> >     by the driver itself  now...
> >
> >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >     Signed-off-by: David S. Miller <davem@davemloft.net>
> 
>    Looks like in this case I had no choice since R8A7790 support for
> the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> patches thru the shmobile tree, we'd have gotten an error in the
> driver...
>    I guess it's too early to fix this in any particular tree except
> for linux-next itself... let me know what I can do.

This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
So it seems to me that a fix for this could go through the shmobile tree
if it is acceptable to merge net-next into the base of a pull-request.

Kevin, Olof, could you give some guidance here.

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Olof Johansson]

On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
> On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> > Hello.
> > 
> > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
> > 
> > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > >This one is triggering a new build failure in -next:
> > 
> > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
> > 
> > >>+/* Ether */
> > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> > >>+	.phy			= 0x1,
> > >>+	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
> > >>+	.register_type		= SH_ETH_REG_FAST_RCAR,
> > 
> > >and it looks to be because this board is trying to use the register_type
> > >field which was removed by:
> > 
> > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > >Date:   Sun Aug 18 03:13:26 2013 +0400
> > >
> > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> > >
> > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> > >     used by the driver anymore, it's time to remove it and  its initializers from
> > >     the SH platform code. Also  move *enum* declaring values for this  field from
> > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
> > >     by the driver itself  now...
> > >
> > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > >     Signed-off-by: David S. Miller <davem@davemloft.net>
> > 
> >    Looks like in this case I had no choice since R8A7790 support for
> > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> > patches thru the shmobile tree, we'd have gotten an error in the
> > driver...
> >    I guess it's too early to fix this in any particular tree except
> > for linux-next itself... let me know what I can do.
> 
> This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
> So it seems to me that a fix for this could go through the shmobile tree
> if it is acceptable to merge net-next into the base of a pull-request.
> 
> Kevin, Olof, could you give some guidance here.

I don't think we want to pull in net-next here just for this -- that is a
massive branch.

There's no great solution to any of this, unfortunately.

I think easiest would be if we add a patch that fixes this up _only_ in
for-next, and merge the same patch upstream as soon as net-next lands
(if it lands after arm-soc, otherwise we include it in our branch),
that might be the least painful way to do this.

That patch would just remove the assignment to register_type in the
board file.


-Olof

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Wed, Aug 21, 2013 at 11:53:25PM -0700, Olof Johansson wrote:
> On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
> > On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> > > Hello.
> > > 
> > > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
> > > 
> > > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > > 
> > > >This one is triggering a new build failure in -next:
> > > 
> > > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> > > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
> > > 
> > > >>+/* Ether */
> > > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> > > >>+	.phy			= 0x1,
> > > >>+	.edmac_endian		= EDMAC_LITTLE_ENDIAN,
> > > >>+	.register_type		= SH_ETH_REG_FAST_RCAR,
> > > 
> > > >and it looks to be because this board is trying to use the register_type
> > > >field which was removed by:
> > > 
> > > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> > > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > > >Date:   Sun Aug 18 03:13:26 2013 +0400
> > > >
> > > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> > > >
> > > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> > > >     used by the driver anymore, it's time to remove it and  its initializers from
> > > >     the SH platform code. Also  move *enum* declaring values for this  field from
> > > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
> > > >     by the driver itself  now...
> > > >
> > > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > > >     Signed-off-by: David S. Miller <davem@davemloft.net>
> > > 
> > >    Looks like in this case I had no choice since R8A7790 support for
> > > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> > > patches thru the shmobile tree, we'd have gotten an error in the
> > > driver...
> > >    I guess it's too early to fix this in any particular tree except
> > > for linux-next itself... let me know what I can do.
> > 
> > This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
> > So it seems to me that a fix for this could go through the shmobile tree
> > if it is acceptable to merge net-next into the base of a pull-request.
> > 
> > Kevin, Olof, could you give some guidance here.
> 
> I don't think we want to pull in net-next here just for this -- that is a
> massive branch.
> 
> There's no great solution to any of this, unfortunately.
> 
> I think easiest would be if we add a patch that fixes this up _only_ in
> for-next, and merge the same patch upstream as soon as net-next lands
> (if it lands after arm-soc, otherwise we include it in our branch),
> that might be the least painful way to do this.
> 
> That patch would just remove the assignment to register_type in the
> board file.

That is fine by me.

I think it would be easiest to supply the patch to you as
a patch in email rather than a pull request.

Does that work for you?

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Olof Johansson]

On Thu, Aug 22, 2013 at 12:01 AM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Aug 21, 2013 at 11:53:25PM -0700, Olof Johansson wrote:
>> On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
>> > On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
>> > > Hello.
>> > >
>> > > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
>> > >
>> > > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> > > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>> > >
>> > > >This one is triggering a new build failure in -next:
>> > >
>> > > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
>> > > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
>> > >
>> > > >>+/* Ether */
>> > > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
>> > > >>+       .phy                    = 0x1,
>> > > >>+       .edmac_endian           = EDMAC_LITTLE_ENDIAN,
>> > > >>+       .register_type          = SH_ETH_REG_FAST_RCAR,
>> > >
>> > > >and it looks to be because this board is trying to use the register_type
>> > > >field which was removed by:
>> > >
>> > > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
>> > > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>> > > >Date:   Sun Aug 18 03:13:26 2013 +0400
>> > > >
>> > > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
>> > > >
>> > > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
>> > > >     used by the driver anymore, it's time to remove it and  its initializers from
>> > > >     the SH platform code. Also  move *enum* declaring values for this  field from
>> > > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
>> > > >     by the driver itself  now...
>> > > >
>> > > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>> > > >     Signed-off-by: David S. Miller <davem@davemloft.net>
>> > >
>> > >    Looks like in this case I had no choice since R8A7790 support for
>> > > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
>> > > patches thru the shmobile tree, we'd have gotten an error in the
>> > > driver...
>> > >    I guess it's too early to fix this in any particular tree except
>> > > for linux-next itself... let me know what I can do.
>> >
>> > This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
>> > So it seems to me that a fix for this could go through the shmobile tree
>> > if it is acceptable to merge net-next into the base of a pull-request.
>> >
>> > Kevin, Olof, could you give some guidance here.
>>
>> I don't think we want to pull in net-next here just for this -- that is a
>> massive branch.
>>
>> There's no great solution to any of this, unfortunately.
>>
>> I think easiest would be if we add a patch that fixes this up _only_ in
>> for-next, and merge the same patch upstream as soon as net-next lands
>> (if it lands after arm-soc, otherwise we include it in our branch),
>> that might be the least painful way to do this.
>>
>> That patch would just remove the assignment to register_type in the
>> board file.
>
> That is fine by me.
>
> I think it would be easiest to supply the patch to you as
> a patch in email rather than a pull request.
>
> Does that work for you?

Yes, definitely.


-Olof

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Thu, Aug 22, 2013 at 12:04:59AM -0700, Olof Johansson wrote:
> On Thu, Aug 22, 2013 at 12:01 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Aug 21, 2013 at 11:53:25PM -0700, Olof Johansson wrote:
> >> On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
> >> > On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> >> > > Hello.
> >> > >
> >> > > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
> >> > >
> >> > > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >> > > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >> > >
> >> > > >This one is triggering a new build failure in -next:
> >> > >
> >> > > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> >> > > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
> >> > >
> >> > > >>+/* Ether */
> >> > > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> >> > > >>+       .phy                    = 0x1,
> >> > > >>+       .edmac_endian           = EDMAC_LITTLE_ENDIAN,
> >> > > >>+       .register_type          = SH_ETH_REG_FAST_RCAR,
> >> > >
> >> > > >and it looks to be because this board is trying to use the register_type
> >> > > >field which was removed by:
> >> > >
> >> > > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> >> > > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >> > > >Date:   Sun Aug 18 03:13:26 2013 +0400
> >> > > >
> >> > > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> >> > > >
> >> > > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> >> > > >     used by the driver anymore, it's time to remove it and  its initializers from
> >> > > >     the SH platform code. Also  move *enum* declaring values for this  field from
> >> > > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
> >> > > >     by the driver itself  now...
> >> > > >
> >> > > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >> > > >     Signed-off-by: David S. Miller <davem@davemloft.net>
> >> > >
> >> > >    Looks like in this case I had no choice since R8A7790 support for
> >> > > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> >> > > patches thru the shmobile tree, we'd have gotten an error in the
> >> > > driver...
> >> > >    I guess it's too early to fix this in any particular tree except
> >> > > for linux-next itself... let me know what I can do.
> >> >
> >> > This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
> >> > So it seems to me that a fix for this could go through the shmobile tree
> >> > if it is acceptable to merge net-next into the base of a pull-request.
> >> >
> >> > Kevin, Olof, could you give some guidance here.
> >>
> >> I don't think we want to pull in net-next here just for this -- that is a
> >> massive branch.
> >>
> >> There's no great solution to any of this, unfortunately.
> >>
> >> I think easiest would be if we add a patch that fixes this up _only_ in
> >> for-next, and merge the same patch upstream as soon as net-next lands
> >> (if it lands after arm-soc, otherwise we include it in our branch),
> >> that might be the least painful way to do this.
> >>
> >> That patch would just remove the assignment to register_type in the
> >> board file.
> >
> > That is fine by me.
> >
> > I think it would be easiest to supply the patch to you as
> > a patch in email rather than a pull request.
> >
> > Does that work for you?
> 
> Yes, definitely.

Thanks, I have posted it as
"[PATCH] ARM: shmobile: lager: Do not use register_type field of struct".

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Olof Johansson]

On Thu, Aug 22, 2013 at 12:37 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Aug 22, 2013 at 12:04:59AM -0700, Olof Johansson wrote:
>> On Thu, Aug 22, 2013 at 12:01 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Aug 21, 2013 at 11:53:25PM -0700, Olof Johansson wrote:
>> >> On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
>> >> > On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
>> >> > > Hello.
>> >> > >
>> >> > > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
>> >> > >
>> >> > > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> >> > > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>> >> > >
>> >> > > >This one is triggering a new build failure in -next:
>> >> > >
>> >> > > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
>> >> > > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
>> >> > >
>> >> > > >>+/* Ether */
>> >> > > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
>> >> > > >>+       .phy                    = 0x1,
>> >> > > >>+       .edmac_endian           = EDMAC_LITTLE_ENDIAN,
>> >> > > >>+       .register_type          = SH_ETH_REG_FAST_RCAR,
>> >> > >
>> >> > > >and it looks to be because this board is trying to use the register_type
>> >> > > >field which was removed by:
>> >> > >
>> >> > > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
>> >> > > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>> >> > > >Date:   Sun Aug 18 03:13:26 2013 +0400
>> >> > > >
>> >> > > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
>> >> > > >
>> >> > > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
>> >> > > >     used by the driver anymore, it's time to remove it and  its initializers from
>> >> > > >     the SH platform code. Also  move *enum* declaring values for this  field from
>> >> > > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
>> >> > > >     by the driver itself  now...
>> >> > > >
>> >> > > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>> >> > > >     Signed-off-by: David S. Miller <davem@davemloft.net>
>> >> > >
>> >> > >    Looks like in this case I had no choice since R8A7790 support for
>> >> > > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
>> >> > > patches thru the shmobile tree, we'd have gotten an error in the
>> >> > > driver...
>> >> > >    I guess it's too early to fix this in any particular tree except
>> >> > > for linux-next itself... let me know what I can do.
>> >> >
>> >> > This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
>> >> > So it seems to me that a fix for this could go through the shmobile tree
>> >> > if it is acceptable to merge net-next into the base of a pull-request.
>> >> >
>> >> > Kevin, Olof, could you give some guidance here.
>> >>
>> >> I don't think we want to pull in net-next here just for this -- that is a
>> >> massive branch.
>> >>
>> >> There's no great solution to any of this, unfortunately.
>> >>
>> >> I think easiest would be if we add a patch that fixes this up _only_ in
>> >> for-next, and merge the same patch upstream as soon as net-next lands
>> >> (if it lands after arm-soc, otherwise we include it in our branch),
>> >> that might be the least painful way to do this.
>> >>
>> >> That patch would just remove the assignment to register_type in the
>> >> board file.
>> >
>> > That is fine by me.
>> >
>> > I think it would be easiest to supply the patch to you as
>> > a patch in email rather than a pull request.
>> >
>> > Does that work for you?
>>
>> Yes, definitely.
>
> Thanks, I have posted it as
> "[PATCH] ARM: shmobile: lager: Do not use register_type field of struct".

Ok, I forgot to include this when sending the code up today, so lager
is currently broken in mainline. I'll include it in the next branch we
send up.


-Olof

[GIT PULL 3/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Fri, Sep 06, 2013 at 02:32:16PM -0700, Olof Johansson wrote:
> On Thu, Aug 22, 2013 at 12:37 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Aug 22, 2013 at 12:04:59AM -0700, Olof Johansson wrote:
> >> On Thu, Aug 22, 2013 at 12:01 AM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Wed, Aug 21, 2013 at 11:53:25PM -0700, Olof Johansson wrote:
> >> >> On Thu, Aug 22, 2013 at 09:16:49AM +0900, Simon Horman wrote:
> >> >> > On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> >> >> > > Hello.
> >> >> > >
> >> >> > > On 08/21/2013 08:01 PM, Kevin Hilman wrote:
> >> >> > >
> >> >> > > >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >> >> > > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >> >> > >
> >> >> > > >This one is triggering a new build failure in -next:
> >> >> > >
> >> >> > > >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> >> >> > > >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
> >> >> > >
> >> >> > > >>+/* Ether */
> >> >> > > >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> >> >> > > >>+       .phy                    = 0x1,
> >> >> > > >>+       .edmac_endian           = EDMAC_LITTLE_ENDIAN,
> >> >> > > >>+       .register_type          = SH_ETH_REG_FAST_RCAR,
> >> >> > >
> >> >> > > >and it looks to be because this board is trying to use the register_type
> >> >> > > >field which was removed by:
> >> >> > >
> >> >> > > >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> >> >> > > >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >> >> > > >Date:   Sun Aug 18 03:13:26 2013 +0400
> >> >> > > >
> >> >> > > >     sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> >> >> > > >
> >> >> > > >     Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> >> >> > > >     used by the driver anymore, it's time to remove it and  its initializers from
> >> >> > > >     the SH platform code. Also  move *enum* declaring values for this  field from
> >> >> > > >     <linux/sh_eth.h>  to  the  local driver's  header file as they're only needed
> >> >> > > >     by the driver itself  now...
> >> >> > > >
> >> >> > > >     Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >> >> > > >     Signed-off-by: David S. Miller <davem@davemloft.net>
> >> >> > >
> >> >> > >    Looks like in this case I had no choice since R8A7790 support for
> >> >> > > the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> >> >> > > patches thru the shmobile tree, we'd have gotten an error in the
> >> >> > > driver...
> >> >> > >    I guess it's too early to fix this in any particular tree except
> >> >> > > for linux-next itself... let me know what I can do.
> >> >> >
> >> >> > This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
> >> >> > So it seems to me that a fix for this could go through the shmobile tree
> >> >> > if it is acceptable to merge net-next into the base of a pull-request.
> >> >> >
> >> >> > Kevin, Olof, could you give some guidance here.
> >> >>
> >> >> I don't think we want to pull in net-next here just for this -- that is a
> >> >> massive branch.
> >> >>
> >> >> There's no great solution to any of this, unfortunately.
> >> >>
> >> >> I think easiest would be if we add a patch that fixes this up _only_ in
> >> >> for-next, and merge the same patch upstream as soon as net-next lands
> >> >> (if it lands after arm-soc, otherwise we include it in our branch),
> >> >> that might be the least painful way to do this.
> >> >>
> >> >> That patch would just remove the assignment to register_type in the
> >> >> board file.
> >> >
> >> > That is fine by me.
> >> >
> >> > I think it would be easiest to supply the patch to you as
> >> > a patch in email rather than a pull request.
> >> >
> >> > Does that work for you?
> >>
> >> Yes, definitely.
> >
> > Thanks, I have posted it as
> > "[PATCH] ARM: shmobile: lager: Do not use register_type field of struct".
> 
> Ok, I forgot to include this when sending the code up today, so lager
> is currently broken in mainline. I'll include it in the next branch we
> send up.

Thanks Olof,

please let me know if there are any problems and you need me
to help out.