[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 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 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 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 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

Re: [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 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

Re: [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

[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>

Re: [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

[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

Re: [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

[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.

Re: [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

[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

Re: [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

[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?

Re: [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

[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

Re: [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

[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".

Re: [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

[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

Re: [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.

[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.

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.13

[Simon Horman]

Hi Kevin, Hi Olof, Hi Arnd,

Please consider this second round of Renesas ARM Based SoC DT Updates for
v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
which you have already pulled.


The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:

  ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14

for you to fetch changes up to bd0609896eabe2e64b75d7955ae5ecec528cf860:

  ARM: shmobile: koelsch: dts: Add gpio-keys device (2013-12-12 22:22:04 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.13

* r8a7791 (R-Car M2) based Koelsch board
- Add GPIO keys

* sh73a0 (SH-Mobile AG5) based kzm9g board
  - Add FSI support

----------------------------------------------------------------
Kuninori Morimoto (2):
      ARM: shmobile: sh73a0: add FSI support via DTSI
      ARM: shmobile: kzm9g: add FSI support for DTS

Laurent Pinchart (1):
      ARM: shmobile: koelsch: dts: Add gpio-keys device

 arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    | 33 +++++++++++++++
 arch/arm/boot/dts/sh73a0.dtsi                   |  9 +++++
 3 files changed, 96 insertions(+)

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.13

[Simon Horman]

Hi Kevin, Hi Olof, Hi Arnd,

Please consider this second round of Renesas ARM Based SoC DT Updates for
v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
which you have already pulled.


The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:

  ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14

for you to fetch changes up to bd0609896eabe2e64b75d7955ae5ecec528cf860:

  ARM: shmobile: koelsch: dts: Add gpio-keys device (2013-12-12 22:22:04 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.13

* r8a7791 (R-Car M2) based Koelsch board
- Add GPIO keys

* sh73a0 (SH-Mobile AG5) based kzm9g board
  - Add FSI support

----------------------------------------------------------------
Kuninori Morimoto (2):
      ARM: shmobile: sh73a0: add FSI support via DTSI
      ARM: shmobile: kzm9g: add FSI support for DTS

Laurent Pinchart (1):
      ARM: shmobile: koelsch: dts: Add gpio-keys device

 arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    | 33 +++++++++++++++
 arch/arm/boot/dts/sh73a0.dtsi                   |  9 +++++
 3 files changed, 96 insertions(+)

[PATCH 1/3] ARM: shmobile: sh73a0: add FSI support via DTSI

[Simon Horman]

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 241c8cd..c460dd2 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -243,4 +243,13 @@
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
+
+	sh_fsi2: sound@ec230000 {
+		#sound-dai-cells = <1>;
+		compatible = "renesas,sh_fsi2";
+		reg = <0xec230000 0x400>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 146 0x4>;
+		status = "disabled";
+	};
 };
-- 
1.8.4

[PATCH 1/3] ARM: shmobile: sh73a0: add FSI support via DTSI

[Simon Horman]

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 241c8cd..c460dd2 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -243,4 +243,13 @@
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
+
+	sh_fsi2: sound at ec230000 {
+		#sound-dai-cells = <1>;
+		compatible = "renesas,sh_fsi2";
+		reg = <0xec230000 0x400>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 146 0x4>;
+		status = "disabled";
+	};
 };
-- 
1.8.4

[PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Simon Horman]

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

This patch support FSI-AK4648 with simple audio card

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 5bb593d..eb8886b 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -152,6 +152,20 @@
 			label = "SW1";
 		};
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "left_j";
+		simple-audio-card,cpu {
+			sound-dai = <&sh_fsi2 0>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&ak4648>;
+			bitclock-master;
+			frame-master;
+			system-clock-frequency = <11289600>;
+		};
+	};
 };
 
 &i2c0 {
@@ -226,6 +240,12 @@
 			};
 		};
 	};
+
+	ak4648: ak4648@0x12 {
+		#sound-dai-cells = <0>;
+		compatible = "asahi-kasei,ak4648";
+		reg = <0x12>;
+	};
 };
 
 &i2c3 {
@@ -289,6 +309,12 @@
 		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
 		renesas,function = "sdhi2";
 	};
+
+	fsia_pins: sounda {
+		renesas,groups = "fsia_mclk_in", "fsia_sclk_in",
+				 "fsia_data_in", "fsia_data_out";
+		renesas,function = "fsia";
+	};
 };
 
 &sdhi0 {
@@ -309,3 +335,10 @@
 	broken-cd;
 	status = "okay";
 };
+
+&sh_fsi2 {
+	pinctrl-0 = <&fsia_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
-- 
1.8.4

[PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Simon Horman]

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

This patch support FSI-AK4648 with simple audio card

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 5bb593d..eb8886b 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -152,6 +152,20 @@
 			label = "SW1";
 		};
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "left_j";
+		simple-audio-card,cpu {
+			sound-dai = <&sh_fsi2 0>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&ak4648>;
+			bitclock-master;
+			frame-master;
+			system-clock-frequency = <11289600>;
+		};
+	};
 };
 
 &i2c0 {
@@ -226,6 +240,12 @@
 			};
 		};
 	};
+
+	ak4648: ak4648 at 0x12 {
+		#sound-dai-cells = <0>;
+		compatible = "asahi-kasei,ak4648";
+		reg = <0x12>;
+	};
 };
 
 &i2c3 {
@@ -289,6 +309,12 @@
 		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
 		renesas,function = "sdhi2";
 	};
+
+	fsia_pins: sounda {
+		renesas,groups = "fsia_mclk_in", "fsia_sclk_in",
+				 "fsia_data_in", "fsia_data_out";
+		renesas,function = "fsia";
+	};
 };
 
 &sdhi0 {
@@ -309,3 +335,10 @@
 	broken-cd;
 	status = "okay";
 };
+
+&sh_fsi2 {
+	pinctrl-0 = <&fsia_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
-- 
1.8.4

[PATCH 3/3] ARM: shmobile: koelsch: dts: Add gpio-keys device

[Simon Horman]

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

The board has 7 buttons connected to GPIOs, add a corresponding
gpio-keys device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
index 1919273..588ca17 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
@@ -31,6 +31,60 @@
 		#size-cells = <1>;
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		key-a {
+			gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+			linux,code = <30>;
+			label = "SW30";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-b {
+			gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
+			linux,code = <48>;
+			label = "SW31";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-c {
+			gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
+			linux,code = <46>;
+			label = "SW32";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-d {
+			gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
+			linux,code = <32>;
+			label = "SW33";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-e {
+			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
+			linux,code = <18>;
+			label = "SW34";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-f {
+			gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
+			linux,code = <33>;
+			label = "SW35";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-g {
+			gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
+			linux,code = <34>;
+			label = "SW36";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		led6 {
-- 
1.8.4

[PATCH 3/3] ARM: shmobile: koelsch: dts: Add gpio-keys device

[Simon Horman]

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

The board has 7 buttons connected to GPIOs, add a corresponding
gpio-keys device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
index 1919273..588ca17 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
@@ -31,6 +31,60 @@
 		#size-cells = <1>;
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		key-a {
+			gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+			linux,code = <30>;
+			label = "SW30";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-b {
+			gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
+			linux,code = <48>;
+			label = "SW31";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-c {
+			gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
+			linux,code = <46>;
+			label = "SW32";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-d {
+			gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
+			linux,code = <32>;
+			label = "SW33";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-e {
+			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
+			linux,code = <18>;
+			label = "SW34";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-f {
+			gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
+			linux,code = <33>;
+			label = "SW35";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+		key-g {
+			gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
+			linux,code = <34>;
+			label = "SW36";
+			gpio-key,wakeup;
+			debounce-interval = <20>;
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		led6 {
-- 
1.8.4

Re: [PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Sergei Shtylyov]

Hello.

On 23-12-2013 6:08, Simon Horman wrote:

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

> This patch support FSI-AK4648 with simple audio card

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33 ++++++++++++++++++++++++++++
>   1 file changed, 33 insertions(+)

> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> index 5bb593d..eb8886b 100644
> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
[...]
> @@ -226,6 +240,12 @@
>   			};
>   		};
>   	};
> +
> +	ak4648: ak4648@0x12 {

    Perhaps "sound-codec" or "audio-codec" would be a better name; hardware 
specific names are not recommended by ePAPR. And drop "0x" from the address 
part please.

> +		#sound-dai-cells = <0>;
> +		compatible = "asahi-kasei,ak4648";
> +		reg = <0x12>;
> +	};
>   };
>
>   &i2c3 {

WBR, Sergei

[PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Sergei Shtylyov]

Hello.

On 23-12-2013 6:08, Simon Horman wrote:

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

> This patch support FSI-AK4648 with simple audio card

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33 ++++++++++++++++++++++++++++
>   1 file changed, 33 insertions(+)

> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> index 5bb593d..eb8886b 100644
> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
[...]
> @@ -226,6 +240,12 @@
>   			};
>   		};
>   	};
> +
> +	ak4648: ak4648 at 0x12 {

    Perhaps "sound-codec" or "audio-codec" would be a better name; hardware 
specific names are not recommended by ePAPR. And drop "0x" from the address 
part please.

> +		#sound-dai-cells = <0>;
> +		compatible = "asahi-kasei,ak4648";
> +		reg = <0x12>;
> +	};
>   };
>
>   &i2c3 {

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Sergei Shtylyov]

Hello.

On 23-12-2013 17:21, Sergei Shtylyov wrote:

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

>> This patch support FSI-AK4648 with simple audio card

>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>> ---
>>   arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33
>> ++++++++++++++++++++++++++++
>>   1 file changed, 33 insertions(+)

>> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> index 5bb593d..eb8886b 100644
>> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> [...]
>> @@ -226,6 +240,12 @@
>>               };
>>           };
>>       };
>> +
>> +    ak4648: ak4648@0x12 {

>     Perhaps "sound-codec" or "audio-codec" would be a better name; hardware
> specific names are not recommended by ePAPR. And drop "0x" from the address
> part please.

    Sorry, I didn't notice the patch is posted as a part of pull request; I've 
probably missed the original posting (though I've already told to Morimoto-san 
that names like "ak4648" shouldn't be used).

WBR, Sergei

[PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Sergei Shtylyov]

Hello.

On 23-12-2013 17:21, Sergei Shtylyov wrote:

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

>> This patch support FSI-AK4648 with simple audio card

>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>> ---
>>   arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33
>> ++++++++++++++++++++++++++++
>>   1 file changed, 33 insertions(+)

>> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> index 5bb593d..eb8886b 100644
>> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
>> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> [...]
>> @@ -226,6 +240,12 @@
>>               };
>>           };
>>       };
>> +
>> +    ak4648: ak4648 at 0x12 {

>     Perhaps "sound-codec" or "audio-codec" would be a better name; hardware
> specific names are not recommended by ePAPR. And drop "0x" from the address
> part please.

    Sorry, I didn't notice the patch is posted as a part of pull request; I've 
probably missed the original posting (though I've already told to Morimoto-san 
that names like "ak4648" shouldn't be used).

WBR, Sergei

Re: [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.14

[Simon Horman]

[ Corrected subject: s/3.13.3.14 ]

On Mon, Dec 23, 2013 at 11:08:12AM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
> 
> Please consider this second round of Renesas ARM Based SoC DT Updates for
> v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
> which you have already pulled.
> 
> 
> The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:
> 
>   ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14
> 
> for you to fetch changes up to bd0609896eabe2e64b75d7955ae5ecec528cf860:
> 
>   ARM: shmobile: koelsch: dts: Add gpio-keys device (2013-12-12 22:22:04 +0900)
> 
> ----------------------------------------------------------------
> Second Round of Renesas ARM Based SoC DT Updates for v3.13
> 
> * r8a7791 (R-Car M2) based Koelsch board
> - Add GPIO keys
> 
> * sh73a0 (SH-Mobile AG5) based kzm9g board
>   - Add FSI support
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (2):
>       ARM: shmobile: sh73a0: add FSI support via DTSI
>       ARM: shmobile: kzm9g: add FSI support for DTS
> 
> Laurent Pinchart (1):
>       ARM: shmobile: koelsch: dts: Add gpio-keys device
> 
>  arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
>  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    | 33 +++++++++++++++
>  arch/arm/boot/dts/sh73a0.dtsi                   |  9 +++++
>  3 files changed, 96 insertions(+)
> 

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.14

[Simon Horman]

[ Corrected subject: s/3.13.3.14 ]

On Mon, Dec 23, 2013 at 11:08:12AM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
> 
> Please consider this second round of Renesas ARM Based SoC DT Updates for
> v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
> which you have already pulled.
> 
> 
> The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:
> 
>   ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14
> 
> for you to fetch changes up to bd0609896eabe2e64b75d7955ae5ecec528cf860:
> 
>   ARM: shmobile: koelsch: dts: Add gpio-keys device (2013-12-12 22:22:04 +0900)
> 
> ----------------------------------------------------------------
> Second Round of Renesas ARM Based SoC DT Updates for v3.13
> 
> * r8a7791 (R-Car M2) based Koelsch board
> - Add GPIO keys
> 
> * sh73a0 (SH-Mobile AG5) based kzm9g board
>   - Add FSI support
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (2):
>       ARM: shmobile: sh73a0: add FSI support via DTSI
>       ARM: shmobile: kzm9g: add FSI support for DTS
> 
> Laurent Pinchart (1):
>       ARM: shmobile: koelsch: dts: Add gpio-keys device
> 
>  arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 54 +++++++++++++++++++++++++
>  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    | 33 +++++++++++++++
>  arch/arm/boot/dts/sh73a0.dtsi                   |  9 +++++
>  3 files changed, 96 insertions(+)
> 

Re: [PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Simon Horman]

On Mon, Dec 23, 2013 at 06:10:09PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 23-12-2013 17:21, Sergei Shtylyov wrote:
> 
> >>From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> >>This patch support FSI-AK4648 with simple audio card
> 
> >>Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >>---
> >>  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33
> >>++++++++++++++++++++++++++++
> >>  1 file changed, 33 insertions(+)
> 
> >>diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>index 5bb593d..eb8886b 100644
> >>--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >[...]
> >>@@ -226,6 +240,12 @@
> >>              };
> >>          };
> >>      };
> >>+
> >>+    ak4648: ak4648@0x12 {
> 
> >    Perhaps "sound-codec" or "audio-codec" would be a better name; hardware
> >specific names are not recommended by ePAPR. And drop "0x" from the address
> >part please.
> 
>    Sorry, I didn't notice the patch is posted as a part of pull
> request; I've probably missed the original posting (though I've
> already told to Morimoto-san that names like "ak4648" shouldn't be
> used).

Indeed, I think that you have commended on node naming on more
than one occasion. Feel free to make some cleanup patches if you
have the inclination.

[PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS

[Simon Horman]

On Mon, Dec 23, 2013 at 06:10:09PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 23-12-2013 17:21, Sergei Shtylyov wrote:
> 
> >>From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> >>This patch support FSI-AK4648 with simple audio card
> 
> >>Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >>---
> >>  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 33
> >>++++++++++++++++++++++++++++
> >>  1 file changed, 33 insertions(+)
> 
> >>diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>index 5bb593d..eb8886b 100644
> >>--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >>+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> >[...]
> >>@@ -226,6 +240,12 @@
> >>              };
> >>          };
> >>      };
> >>+
> >>+    ak4648: ak4648 at 0x12 {
> 
> >    Perhaps "sound-codec" or "audio-codec" would be a better name; hardware
> >specific names are not recommended by ePAPR. And drop "0x" from the address
> >part please.
> 
>    Sorry, I didn't notice the patch is posted as a part of pull
> request; I've probably missed the original posting (though I've
> already told to Morimoto-san that names like "ak4648" shouldn't be
> used).

Indeed, I think that you have commended on node naming on more
than one occasion. Feel free to make some cleanup patches if you
have the inclination.

[GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13

[Simon Horman]

Hi Kevin, Hi Olof, Hi Arnd,

please consider this second round of Renesas ARM based SoC fixes for v3.13.
It is based on the first round of fixes, tagged as renesas-fixes-for-v3.13,
which you have previously pulled.


The following changes since commit 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040:

  ARM: shmobile: r8a7790: Fix GPIO resources in DTS (2013-11-28 17:04:39 +0900)

are available in the git repository at:

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

for you to fetch changes up to d721a15c300c5f638a11573a6dd492158e737d6a:

  ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM based SoC Fixes for v3.13

* r8a7790 (R-Car H2) based Lager board

  - Correct SHDI resource sizes

    This bug has been present since sdhi resources were added to the r8a7790 by
    8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
    templates") in v3.11-rc2.

* r8a7778 (R-Car M1) based Bock-W board

  - Correct DMA mask

    This resolves a regression introduced by 4dcfa60071b3d23f
    ("ARM: DMA-API: better handing of DMA masks for coherent allocations")
    in v3.12-rc1.

* r8a7740 (R-Mobile A1) based Armadillo board

  - Add PWM backlight power supply

    This resolves a regression introduced by 22ceeee16eb8f0d0
    ("pwm-backlight: Add power supply support") in v3.12.

----------------------------------------------------------------
Ben Dooks (1):
      ARM: shmobile: r8a7790: fix shdi resource sizes

Kuninori Morimoto (1):
      ARM: shmobile: bockw: fixup DMA mask

Laurent Pinchart (1):
      ARM: shmobile: armadillo: Add PWM backlight power supply

 arch/arm/boot/dts/r8a7790.dtsi                 | 4 ++--
 arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++++++
 arch/arm/mach-shmobile/board-bockw.c           | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

[GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13

[Simon Horman]

Hi Kevin, Hi Olof, Hi Arnd,

please consider this second round of Renesas ARM based SoC fixes for v3.13.
It is based on the first round of fixes, tagged as renesas-fixes-for-v3.13,
which you have previously pulled.


The following changes since commit 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040:

  ARM: shmobile: r8a7790: Fix GPIO resources in DTS (2013-11-28 17:04:39 +0900)

are available in the git repository at:

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

for you to fetch changes up to d721a15c300c5f638a11573a6dd492158e737d6a:

  ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM based SoC Fixes for v3.13

* r8a7790 (R-Car H2) based Lager board

  - Correct SHDI resource sizes

    This bug has been present since sdhi resources were added to the r8a7790 by
    8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
    templates") in v3.11-rc2.

* r8a7778 (R-Car M1) based Bock-W board

  - Correct DMA mask

    This resolves a regression introduced by 4dcfa60071b3d23f
    ("ARM: DMA-API: better handing of DMA masks for coherent allocations")
    in v3.12-rc1.

* r8a7740 (R-Mobile A1) based Armadillo board

  - Add PWM backlight power supply

    This resolves a regression introduced by 22ceeee16eb8f0d0
    ("pwm-backlight: Add power supply support") in v3.12.

----------------------------------------------------------------
Ben Dooks (1):
      ARM: shmobile: r8a7790: fix shdi resource sizes

Kuninori Morimoto (1):
      ARM: shmobile: bockw: fixup DMA mask

Laurent Pinchart (1):
      ARM: shmobile: armadillo: Add PWM backlight power supply

 arch/arm/boot/dts/r8a7790.dtsi                 | 4 ++--
 arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++++++
 arch/arm/mach-shmobile/board-bockw.c           | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

[PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply

[Simon Horman]

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

Commit 22ceeee16eb8f0d04de3ef43a5174fb30ec18af9 ("pwm-backlight: Add
power supply support") added a mandatory power supply for the PWM
backlight. Add a fixed 5V regulator to board code with a consumer supply
entry for the backlight device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ad11cb9a5cf96346f1240995c672cdbb5501785c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 958e3cb..c186891 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -614,6 +614,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
 	REGULATOR_SUPPLY("vqmmc", "sh_mmcif"),
 };
 
+/* Fixed 3.3V regulator used by LCD backlight */
+static struct regulator_consumer_supply fixed5v0_power_consumers[] = {
+	REGULATOR_SUPPLY("power", "pwm-backlight.0"),
+};
+
 /* Fixed 3.3V regulator to be used by SDHI0 */
 static struct regulator_consumer_supply vcc_sdhi0_consumers[] = {
 	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
@@ -1196,6 +1201,8 @@ static void __init eva_init(void)
 
 	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
 				     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+	regulator_register_always_on(3, "fixed-5.0V", fixed5v0_power_consumers,
+				     ARRAY_SIZE(fixed5v0_power_consumers), 5000000);
 
 	pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
 	pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
-- 
1.8.4

[PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply

[Simon Horman]

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

Commit 22ceeee16eb8f0d04de3ef43a5174fb30ec18af9 ("pwm-backlight: Add
power supply support") added a mandatory power supply for the PWM
backlight. Add a fixed 5V regulator to board code with a consumer supply
entry for the backlight device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ad11cb9a5cf96346f1240995c672cdbb5501785c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 958e3cb..c186891 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -614,6 +614,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
 	REGULATOR_SUPPLY("vqmmc", "sh_mmcif"),
 };
 
+/* Fixed 3.3V regulator used by LCD backlight */
+static struct regulator_consumer_supply fixed5v0_power_consumers[] = {
+	REGULATOR_SUPPLY("power", "pwm-backlight.0"),
+};
+
 /* Fixed 3.3V regulator to be used by SDHI0 */
 static struct regulator_consumer_supply vcc_sdhi0_consumers[] = {
 	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
@@ -1196,6 +1201,8 @@ static void __init eva_init(void)
 
 	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
 				     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+	regulator_register_always_on(3, "fixed-5.0V", fixed5v0_power_consumers,
+				     ARRAY_SIZE(fixed5v0_power_consumers), 5000000);
 
 	pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
 	pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
-- 
1.8.4

[PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask

[Simon Horman]

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

4dcfa60071b3d23f0181f27d8519f12e37cefbb9
(ARM: DMA-API: better handing of DMA masks for coherent allocations)
exchanged DMA mask check method.
Below warning will appear without this patch

asoc-simple-card asoc-simple-card.0: \
  Coherent DMA mask 0xffffffffffffffff is larger than dma_addr_t allows
asoc-simple-card asoc-simple-card.0: \
  Driver did not use or check the return value from dma_set_coherent_mask()?

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-bockw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 3861152..3c4995a 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -679,7 +679,7 @@ static void __init bockw_init(void)
 			.id             = i,
 			.data           = &rsnd_card_info[i],
 			.size_data      = sizeof(struct asoc_simple_card_info),
-			.dma_mask       = ~0,
+			.dma_mask	= DMA_BIT_MASK(32),
 		};
 
 		platform_device_register_full(&cardinfo);
-- 
1.8.4

[PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask

[Simon Horman]

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

4dcfa60071b3d23f0181f27d8519f12e37cefbb9
(ARM: DMA-API: better handing of DMA masks for coherent allocations)
exchanged DMA mask check method.
Below warning will appear without this patch

asoc-simple-card asoc-simple-card.0: \
  Coherent DMA mask 0xffffffffffffffff is larger than dma_addr_t allows
asoc-simple-card asoc-simple-card.0: \
  Driver did not use or check the return value from dma_set_coherent_mask()?

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-bockw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 3861152..3c4995a 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -679,7 +679,7 @@ static void __init bockw_init(void)
 			.id             = i,
 			.data           = &rsnd_card_info[i],
 			.size_data      = sizeof(struct asoc_simple_card_info),
-			.dma_mask       = ~0,
+			.dma_mask	= DMA_BIT_MASK(32),
 		};
 
 		platform_device_register_full(&cardinfo);
-- 
1.8.4

[PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes

[Simon Horman]

From: Ben Dooks <ben.dooks@codethink.co.uk>

The r8a7790.dtsi file has four sdhi nodes which the first two have the wrong
resource size for their register block. This causes the sh_modbile_sdhi driver
to fail to communicate with card at-all.

Change sdhi{0,1} node size from 0x100 to 0x200 to correct these nodes
as per Kuninori Morimoto's response to the original patch where all four
nodes where changed. sdhi{2,3} are the correct size.

This bug has been present since sdhi resources were added to the r8a7790 by
8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
templates") in v3.11-rc2.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: William Towle <william.towle@codethink.co.uk>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 46e1d7e..9987dd0e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -241,7 +241,7 @@
 
 	sdhi0: sdhi@ee100000 {
 		compatible = "renesas,sdhi-r8a7790";
-		reg = <0 0xee100000 0 0x100>;
+		reg = <0 0xee100000 0 0x200>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 165 4>;
 		cap-sd-highspeed;
@@ -250,7 +250,7 @@
 
 	sdhi1: sdhi@ee120000 {
 		compatible = "renesas,sdhi-r8a7790";
-		reg = <0 0xee120000 0 0x100>;
+		reg = <0 0xee120000 0 0x200>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 166 4>;
 		cap-sd-highspeed;
-- 
1.8.4

[PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes

[Simon Horman]

From: Ben Dooks <ben.dooks@codethink.co.uk>

The r8a7790.dtsi file has four sdhi nodes which the first two have the wrong
resource size for their register block. This causes the sh_modbile_sdhi driver
to fail to communicate with card at-all.

Change sdhi{0,1} node size from 0x100 to 0x200 to correct these nodes
as per Kuninori Morimoto's response to the original patch where all four
nodes where changed. sdhi{2,3} are the correct size.

This bug has been present since sdhi resources were added to the r8a7790 by
8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
templates") in v3.11-rc2.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: William Towle <william.towle@codethink.co.uk>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 46e1d7e..9987dd0e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -241,7 +241,7 @@
 
 	sdhi0: sdhi at ee100000 {
 		compatible = "renesas,sdhi-r8a7790";
-		reg = <0 0xee100000 0 0x100>;
+		reg = <0 0xee100000 0 0x200>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 165 4>;
 		cap-sd-highspeed;
@@ -250,7 +250,7 @@
 
 	sdhi1: sdhi at ee120000 {
 		compatible = "renesas,sdhi-r8a7790";
-		reg = <0 0xee120000 0 0x100>;
+		reg = <0 0xee120000 0 0x200>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 166 4>;
 		cap-sd-highspeed;
-- 
1.8.4

Re: [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13

[Olof Johansson]

On Tue, Dec 24, 2013 at 03:04:43PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
> 
> please consider this second round of Renesas ARM based SoC fixes for v3.13.
> It is based on the first round of fixes, tagged as renesas-fixes-for-v3.13,
> which you have previously pulled.
> 
> 
> The following changes since commit 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040:
> 
>   ARM: shmobile: r8a7790: Fix GPIO resources in DTS (2013-11-28 17:04:39 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.13
> 
> for you to fetch changes up to d721a15c300c5f638a11573a6dd492158e737d6a:
> 
>   ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)

Pulled, thanks.


-Olof

[GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13

[Olof Johansson]

On Tue, Dec 24, 2013 at 03:04:43PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
> 
> please consider this second round of Renesas ARM based SoC fixes for v3.13.
> It is based on the first round of fixes, tagged as renesas-fixes-for-v3.13,
> which you have previously pulled.
> 
> 
> The following changes since commit 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040:
> 
>   ARM: shmobile: r8a7790: Fix GPIO resources in DTS (2013-11-28 17:04:39 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.13
> 
> for you to fetch changes up to d721a15c300c5f638a11573a6dd492158e737d6a:
> 
>   ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)

Pulled, thanks.


-Olof

Re: [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.14

[Olof Johansson]

On Tue, Dec 24, 2013 at 12:45:41PM +0900, Simon Horman wrote:
> [ Corrected subject: s/3.13.3.14 ]
> 
> On Mon, Dec 23, 2013 at 11:08:12AM +0900, Simon Horman wrote:
> > Hi Kevin, Hi Olof, Hi Arnd,
> > 
> > Please consider this second round of Renesas ARM Based SoC DT Updates for
> > v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
> > which you have already pulled.
> > 
> > 
> > The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:
> > 
> >   ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14

Pulled, thanks.

-Olof

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.14

[Olof Johansson]

On Tue, Dec 24, 2013 at 12:45:41PM +0900, Simon Horman wrote:
> [ Corrected subject: s/3.13.3.14 ]
> 
> On Mon, Dec 23, 2013 at 11:08:12AM +0900, Simon Horman wrote:
> > Hi Kevin, Hi Olof, Hi Arnd,
> > 
> > Please consider this second round of Renesas ARM Based SoC DT Updates for
> > v3.13. It is based on the first round, tagged as renesas-dt-for-v3.14,
> > which you have already pulled.
> > 
> > 
> > The following changes since commit 1fd219561a4afc51b5f257692f3581546434db5b:
> > 
> >   ARM: shmobile: marzen: enable HSPI0 in DTS (2013-12-10 17:27:25 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14

Pulled, thanks.

-Olof

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

please consider this second round of Renesas ARM based SoC DT updates for
v3.15.

This pull request is based on the first round of such updates, tagged as
renesas-dt-for-v3.15, which I have previously sent a pull-request for.


The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:

  ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15

for you to fetch changes up to e02ee513eed4bb780848a5cedbd4b39afb395d3e:

  ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.15

r8a7791 (R-Car M2) based Koelsch board
- Add QSPI nodes

r7s72100 (RZ/A1H) SoC
- Add RSPI nodes

----------------------------------------------------------------
Geert Uytterhoeven (3):
      ARM: shmobile: r7s72100 dtsi: Add RSPI nodes
      ARM: shmobile: r8a7791 dtsi: Add QSPI node
      ARM: shmobile: koelsch dts: Add QSPI nodes

 arch/arm/boot/dts/r7s72100-genmai-reference.dts |  2 +-
 arch/arm/boot/dts/r7s72100.dtsi                 | 75 +++++++++++++++++++++++++
 arch/arm/boot/dts/r8a7791-koelsch.dts           | 36 ++++++++++++
 arch/arm/boot/dts/r8a7791.dtsi                  | 12 ++++
 4 files changed, 124 insertions(+), 1 deletion(-)

[PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r7s72100-genmai-reference.dts |  2 +-
 arch/arm/boot/dts/r7s72100.dtsi                 | 75 +++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
index da19c70..0849017 100644
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r7s72100.dtsi"
+#include "r7s72100.dtsi"
 
 / {
 	model = "Genmai";
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 46b82aa..9be67a1 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -8,12 +8,22 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	compatible = "renesas,r7s72100";
 	interrupt-parent = <&gic>;
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		spi0 = &spi0;
+		spi1 = &spi1;
+		spi2 = &spi2;
+		spi3 = &spi3;
+		spi4 = &spi4;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -33,4 +43,69 @@
 		reg = <0xe8201000 0x1000>,
 			<0xe8202000 0x1000>;
 	};
+
+	spi0: spi@e800c800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800c800 0x24>;
+		interrupts = <0 238 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 239 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 240 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi1: spi@e800d000 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800d000 0x24>;
+		interrupts = <0 241 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 242 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 243 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi2: spi@e800d800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800d800 0x24>;
+		interrupts = <0 244 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 245 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 246 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi3: spi@e800e000 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800e000 0x24>;
+		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 248 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 249 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi4: spi@e800e800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800e800 0x24>;
+		interrupts = <0 250 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 251 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 252 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
-- 
1.8.5.2

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

please consider this second round of Renesas ARM based SoC DT updates for
v3.15.

This pull request is based on the first round of such updates, tagged as
renesas-dt-for-v3.15, which I have previously sent a pull-request for.


The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:

  ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15

for you to fetch changes up to e02ee513eed4bb780848a5cedbd4b39afb395d3e:

  ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.15

r8a7791 (R-Car M2) based Koelsch board
- Add QSPI nodes

r7s72100 (RZ/A1H) SoC
- Add RSPI nodes

----------------------------------------------------------------
Geert Uytterhoeven (3):
      ARM: shmobile: r7s72100 dtsi: Add RSPI nodes
      ARM: shmobile: r8a7791 dtsi: Add QSPI node
      ARM: shmobile: koelsch dts: Add QSPI nodes

 arch/arm/boot/dts/r7s72100-genmai-reference.dts |  2 +-
 arch/arm/boot/dts/r7s72100.dtsi                 | 75 +++++++++++++++++++++++++
 arch/arm/boot/dts/r8a7791-koelsch.dts           | 36 ++++++++++++
 arch/arm/boot/dts/r8a7791.dtsi                  | 12 ++++
 4 files changed, 124 insertions(+), 1 deletion(-)

[PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r7s72100-genmai-reference.dts |  2 +-
 arch/arm/boot/dts/r7s72100.dtsi                 | 75 +++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
index da19c70..0849017 100644
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r7s72100.dtsi"
+#include "r7s72100.dtsi"
 
 / {
 	model = "Genmai";
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 46b82aa..9be67a1 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -8,12 +8,22 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	compatible = "renesas,r7s72100";
 	interrupt-parent = <&gic>;
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		spi0 = &spi0;
+		spi1 = &spi1;
+		spi2 = &spi2;
+		spi3 = &spi3;
+		spi4 = &spi4;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -33,4 +43,69 @@
 		reg = <0xe8201000 0x1000>,
 			<0xe8202000 0x1000>;
 	};
+
+	spi0: spi at e800c800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800c800 0x24>;
+		interrupts = <0 238 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 239 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 240 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi1: spi at e800d000 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800d000 0x24>;
+		interrupts = <0 241 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 242 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 243 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi2: spi at e800d800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800d800 0x24>;
+		interrupts = <0 244 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 245 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 246 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi3: spi at e800e000 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800e000 0x24>;
+		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 248 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 249 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	spi4: spi at e800e800 {
+		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+		reg = <0xe800e800 0x24>;
+		interrupts = <0 250 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 251 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 252 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "error", "rx", "tx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
-- 
1.8.5.2

[PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d5cc362..240c4ec 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -710,4 +710,16 @@
 			clock-output-names = "scifa3", "scifa4", "scifa5";
 		};
 	};
+
+	spi: spi@e6b10000 {
+		compatible = "renesas,qspi-r8a7791", "renesas,qspi";
+		reg = <0 0xe6b10000 0 0x2c>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
-- 
1.8.5.2

[PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d5cc362..240c4ec 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -710,4 +710,16 @@
 			clock-output-names = "scifa3", "scifa4", "scifa5";
 		};
 	};
+
+	spi: spi at e6b10000 {
+		compatible = "renesas,qspi-r8a7791", "renesas,qspi";
+		reg = <0 0xe6b10000 0 0x2c>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
-- 
1.8.5.2

[PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Add pinctrl and SPI devices for QSPI on Koelsch.
Add Spansion s25fl512s SPI FLASH and MTD partitions.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 74f0985..d4b9bba 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -121,8 +121,44 @@
 		renesas,groups = "scif1_data_d";
 		renesas,function = "scif1";
 	};
+
+	qspi_pins: spi {
+		renesas,groups = "qspi_ctrl", "qspi_data4";
+		renesas,function = "qspi";
+	};
 };
 
 &sata0 {
 	status = "okay";
 };
+
+&spi {
+	pinctrl-0 = <&qspi_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	flash: flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spansion,s25fl512s";
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+		m25p,fast-read;
+
+		partition@0 {
+			label = "loader";
+			reg = <0x00000000 0x00080000>;
+			read-only;
+		};
+		partition@80000 {
+			label = "bootenv";
+			reg = <0x00080000 0x00080000>;
+			read-only;
+		};
+		partition@100000 {
+			label = "data";
+			reg = <0x00100000 0x03f00000>;
+		};
+	};
+};
-- 
1.8.5.2

[PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Add pinctrl and SPI devices for QSPI on Koelsch.
Add Spansion s25fl512s SPI FLASH and MTD partitions.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 74f0985..d4b9bba 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -121,8 +121,44 @@
 		renesas,groups = "scif1_data_d";
 		renesas,function = "scif1";
 	};
+
+	qspi_pins: spi {
+		renesas,groups = "qspi_ctrl", "qspi_data4";
+		renesas,function = "qspi";
+	};
 };
 
 &sata0 {
 	status = "okay";
 };
+
+&spi {
+	pinctrl-0 = <&qspi_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	flash: flash at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spansion,s25fl512s";
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+		m25p,fast-read;
+
+		partition at 0 {
+			label = "loader";
+			reg = <0x00000000 0x00080000>;
+			read-only;
+		};
+		partition at 80000 {
+			label = "bootenv";
+			reg = <0x00080000 0x00080000>;
+			read-only;
+		};
+		partition at 100000 {
+			label = "data";
+			reg = <0x00100000 0x03f00000>;
+		};
+	};
+};
-- 
1.8.5.2

Re: [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15

[Olof Johansson]

On Thu, Feb 13, 2014 at 05:04:46PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> please consider this second round of Renesas ARM based SoC DT updates for
> v3.15.
> 
> This pull request is based on the first round of such updates, tagged as
> renesas-dt-for-v3.15, which I have previously sent a pull-request for.
> 
> 
> The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:
> 
>   ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15

Pulled, thanks.


-Olof

[GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15

[Olof Johansson]

On Thu, Feb 13, 2014 at 05:04:46PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> please consider this second round of Renesas ARM based SoC DT updates for
> v3.15.
> 
> This pull request is based on the first round of such updates, tagged as
> renesas-dt-for-v3.15, which I have previously sent a pull-request for.
> 
> 
> The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:
> 
>   ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15

Pulled, thanks.


-Olof