[PATCH v6 0/3] ARM: shmobile: lager: enable Ether

[PATCH v6 0/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

this short series enables the on-board ethernet
of the r8a7790 SoC for on lager board.

It has a run-time dependency on
"sh_eth: add support for r8a7790 SoC"

It has been built on top of renesas-next-20130726.

Changes noted in changelogs of individual patches.

Simon Horman (3):
  ARM: shmobile: r8a7790: clocks for Ether support
  ARM: shmobile: lager: enable Ether
  ARM: shmobile: lager: enable nfsroot in DTS

 arch/arm/boot/dts/r8a7790-lager.dts    |  2 +-
 arch/arm/mach-shmobile/board-lager.c   | 30 ++++++++++++++++++++++++++++++
 arch/arm/mach-shmobile/clock-r8a7790.c |  4 ++++
 3 files changed, 35 insertions(+), 1 deletion(-)

-- 
1.8.3.2

[PATCH v6 1/3] ARM: shmobile: r8a7790: clocks for Ether support

[Simon Horman]

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

v5
* Split out from "ARM: shmobile: r8a7790: add Ether support"
---
 arch/arm/mach-shmobile/clock-r8a7790.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 50d96f9..fc36d3d 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -51,6 +51,7 @@
 #define SMSTPCR3 0xe615013c
 #define SMSTPCR5 0xe6150144
 #define SMSTPCR7 0xe615014c
+#define SMSTPCR8 0xe6150990
 
 #define SDCKCR		0xE6150074
 #define SD2CKCR		0xE6150078
@@ -180,6 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
 
 /* MSTP */
 enum {
+	MSTP813,
 	MSTP721, MSTP720,
 	MSTP717, MSTP716,
 	MSTP522,
@@ -190,6 +192,7 @@ enum {
 };
 
 static struct clk mstp_clks[MSTP_NR] = {
+	[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
 	[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
 	[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
 	[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
@@ -258,6 +261,7 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
+	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
 	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
-- 
1.8.3.2

[PATCH v6 2/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

This patch has a run-time dependency on "sh_eth: add support for r8a7790 SoC".

v6
* Correct first argument of PIN_MAP_MUX_GROUP_DEFAULT()
  to use "r8a7790-ether" instead of "sh-eth".
* Remove bogus "IRQ0" comment in ether_resources[]

v5
* As suggested by Laurent Pinchart
  - Do not use eth_magic pinmux group, that pin is not used on Lager
* As suggested by Morimoto-san and Magnus Damm
  - Refactor moving all setup code into boards-lager.c

v4
* Remove needs_gpio_reset and reset_gpio from ether_platdata
  as the patch that adds that feature and those fields has
  been dropped.
* Annotate ether_platdata as __initdata

v3
* Use newly added "r8a7790-ether" instead of "sh-eth"

v2
* Do not add MSTP812, EtherAVB. It is not used.
* As suggested by Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
  - Move Ethernet element of MSTP enum to a separate line
  - Move declaration of r8a7790_add_ether_device() to immediately
    after that of r8a7790_add_standard_devices()
  - Add __initdata annotation to ether_resource.
* As suggested by Laurent Pinchart
  - Do not manipilate sh_eth reset GPIO directly,
    rather, do so through newly proposed support for this in
    the sh_eth driver.
* A suggested by Sergei Shtylyov
  - Move DTS portion into a separate patch
---
 arch/arm/mach-shmobile/board-lager.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 3c67b2a..ac4be4a 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)
@@ -114,6 +138,7 @@ static void __init lager_add_standard_devices(void)
 	r8a7790_pinmux_init();
 
 	r8a7790_add_standard_devices();
+
 	platform_device_register_data(&platform_bus, "leds-gpio", -1,
 				      &lager_leds_pdata,
 				      sizeof(lager_leds_pdata));
@@ -125,6 +150,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

[PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Simon Horman]

Now that Ether support has been added to the lager board
it is possible to use nfsroot. This configuration is
in line with that of other shmobile boards.

Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

This patch has a run-time dependency on "ARM: shmobile: lager: enable Ether"

v2
* Split out as a new patch from "ARM: shmobile: lager: enable Ether"
---
 arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 09a84fc..b2f61f0 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -16,7 +16,7 @@
 	compatible = "renesas,lager", "renesas,r8a7790";
 
 	chosen {
-		bootargs = "console=ttySC6,115200 ignore_loglevel";
+		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
 	};
 
 	memory@40000000 {
-- 
1.8.3.2

Re: [PATCH v6 0/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Tue, Jul 30, 2013 at 06:09:18PM +0900, Simon Horman wrote:
> this short series enables the on-board ethernet
> of the r8a7790 SoC for on lager board.
> 
> It has a run-time dependency on
> "sh_eth: add support for r8a7790 SoC"
> 
> It has been built on top of renesas-next-20130726.
> 
> Changes noted in changelogs of individual patches.
> 
> Simon Horman (3):
>   ARM: shmobile: r8a7790: clocks for Ether support
>   ARM: shmobile: lager: enable Ether
>   ARM: shmobile: lager: enable nfsroot in DTS
> 
>  arch/arm/boot/dts/r8a7790-lager.dts    |  2 +-
>  arch/arm/mach-shmobile/board-lager.c   | 30 ++++++++++++++++++++++++++++++
>  arch/arm/mach-shmobile/clock-r8a7790.c |  4 ++++
>  3 files changed, 35 insertions(+), 1 deletion(-)

Hi Magnus, Hi all,

I would appreciate some review of this, and if appropriate an Ack.

Re: [PATCH v6 2/3] ARM: shmobile: lager: enable Ether

[Kuninori Morimoto]

Hi Simon

> @@ -114,6 +138,7 @@ static void __init lager_add_standard_devices(void)
>  	r8a7790_pinmux_init();
>  
>  	r8a7790_add_standard_devices();
> +
>  	platform_device_register_data(&platform_bus, "leds-gpio", -1,
>  				      &lager_leds_pdata,
>  				      sizeof(lager_leds_pdata));
>@@ -125,6 +150,11 @@ static void __init lager_add_standard_devices(void)

I guess above is not needed :)

Except above

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>


Best regards
---
Kuninori Morimoto

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Kuninori Morimoto]

Hi Simon

> Now that Ether support has been added to the lager board
> it is possible to use nfsroot. This configuration is
> in line with that of other shmobile boards.
> 
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(snip)
>  	chosen {
> -		bootargs = "console=ttySC6,115200 ignore_loglevel";
> +		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";

Could you please add why this "rsize/wsize" settings
are needed on bootargs ?
(other shmobile board's dts file doesn't have these)

And, I guess r8a7790-lager.dts/r8a7790.dts doesn't have
"sh-eth" driver DT settings, (or I'm missing ?)
but you added network/nfsroot settings on bootargs.
It is OK for me, but for what ?

Best regards
---
Kuninori Morimoto

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Simon Horman]

On Thu, Aug 01, 2013 at 12:46:44AM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > Now that Ether support has been added to the lager board
> > it is possible to use nfsroot. This configuration is
> > in line with that of other shmobile boards.
> > 
> > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> (snip)
> >  	chosen {
> > -		bootargs = "console=ttySC6,115200 ignore_loglevel";
> > +		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
> 
> Could you please add why this "rsize/wsize" settings
> are needed on bootargs ?
> (other shmobile board's dts file doesn't have these)
> 
> And, I guess r8a7790-lager.dts/r8a7790.dts doesn't have
> "sh-eth" driver DT settings, (or I'm missing ?)
> but you added network/nfsroot settings on bootargs.
> It is OK for me, but for what ?

I think it is copy-paste noise.
I'll remove them.

Re: [PATCH v6 2/3] ARM: shmobile: lager: enable Ether

[Simon Horman]

On Thu, Aug 01, 2013 at 12:40:56AM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > @@ -114,6 +138,7 @@ static void __init lager_add_standard_devices(void)
> >  	r8a7790_pinmux_init();
> >  
> >  	r8a7790_add_standard_devices();
> > +
> >  	platform_device_register_data(&platform_bus, "leds-gpio", -1,
> >  				      &lager_leds_pdata,
> >  				      sizeof(lager_leds_pdata));
> >@@ -125,6 +150,11 @@ static void __init lager_add_standard_devices(void)
> 
> I guess above is not needed :)

Thanks, I will fix that.

> Except above
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks.

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Simon Horman]

On Thu, Aug 01, 2013 at 05:02:28PM +0900, Simon Horman wrote:
> On Thu, Aug 01, 2013 at 12:46:44AM -0700, Kuninori Morimoto wrote:
> > 
> > Hi Simon
> > 
> > > Now that Ether support has been added to the lager board
> > > it is possible to use nfsroot. This configuration is
> > > in line with that of other shmobile boards.
> > > 
> > > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > (snip)
> > >  	chosen {
> > > -		bootargs = "console=ttySC6,115200 ignore_loglevel";
> > > +		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
> > 
> > Could you please add why this "rsize/wsize" settings
> > are needed on bootargs ?
> > (other shmobile board's dts file doesn't have these)
> > 
> > And, I guess r8a7790-lager.dts/r8a7790.dts doesn't have
> > "sh-eth" driver DT settings, (or I'm missing ?)
> > but you added network/nfsroot settings on bootargs.
> > It is OK for me, but for what ?
> 
> I think it is copy-paste noise.
> I'll remove them.

To clarify:

The purpose of adding NFS information to bootargs in r8a7790-lager.dts is
to cause the lager board to use NFS root when booting from using the C
version of the board code which lives in board-lager.c. This is in contrast
to the DT reverence version of the board code, which uses DT more heavily,
does not initialise sh-eth because DT bindings are not available (as far as
I know) and is not effected by r8a7790-lager.dts.

Historically this kind of NFS information was added to the command line in
the defconfig.  However, as part of the long journey to consolidate (reduce
the number of) shmobile defconfigs it now goes in DT instead.


With regards to the "rsize/wsize" settings, I will remove them.
However, I do see them present in the following files and I believe
historically they were present in some of the shmobile defconfigs.

emev2-kzm9d-reference.dts
emev2-kzm9d.dts
r8a7740-armadillo800eva-reference.dts
r8a7740-armadillo800eva.dts

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Kuninori Morimoto]

Hi Simon

> > > >  	chosen {
> > > > -		bootargs = "console=ttySC6,115200 ignore_loglevel";
> > > > +		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
> > > 
(snip)
> The purpose of adding NFS information to bootargs in r8a7790-lager.dts is
> to cause the lager board to use NFS root when booting from using the C
> version of the board code which lives in board-lager.c. This is in contrast
> to the DT reverence version of the board code, which uses DT more heavily,
> does not initialise sh-eth because DT bindings are not available (as far as
> I know) and is not effected by r8a7790-lager.dts.
> 
> Historically this kind of NFS information was added to the command line in
> the defconfig.  However, as part of the long journey to consolidate (reduce
> the number of) shmobile defconfigs it now goes in DT instead.

Thank you.
I don't have any objection to bootargs having NFS information.
My question was only for "rsize/wsize".
Sorry for my confusion English.

> With regards to the "rsize/wsize" settings, I will remove them.
> However, I do see them present in the following files and I believe
> historically they were present in some of the shmobile defconfigs.
> 
> emev2-kzm9d-reference.dts
> emev2-kzm9d.dts
> r8a7740-armadillo800eva-reference.dts
> r8a7740-armadillo800eva.dts

I see.
I don't know why these defconfigs have "rsize/wsize".
But, this information was needed on old kernel version somehow (I forgot when, which version),
and (I guess) there is no such issue now.
We can remove it ?

Best regards
---
Kuninori Morimoto

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Simon Horman]

On Mon, Aug 05, 2013 at 07:18:40PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > > >  	chosen {
> > > > > -		bootargs = "console=ttySC6,115200 ignore_loglevel";
> > > > > +		bootargs = "console=ttySC6,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
> > > > 
> (snip)
> > The purpose of adding NFS information to bootargs in r8a7790-lager.dts is
> > to cause the lager board to use NFS root when booting from using the C
> > version of the board code which lives in board-lager.c. This is in contrast
> > to the DT reverence version of the board code, which uses DT more heavily,
> > does not initialise sh-eth because DT bindings are not available (as far as
> > I know) and is not effected by r8a7790-lager.dts.
> > 
> > Historically this kind of NFS information was added to the command line in
> > the defconfig.  However, as part of the long journey to consolidate (reduce
> > the number of) shmobile defconfigs it now goes in DT instead.
> 
> Thank you.
> I don't have any objection to bootargs having NFS information.
> My question was only for "rsize/wsize".
> Sorry for my confusion English.
> 
> > With regards to the "rsize/wsize" settings, I will remove them.
> > However, I do see them present in the following files and I believe
> > historically they were present in some of the shmobile defconfigs.
> > 
> > emev2-kzm9d-reference.dts
> > emev2-kzm9d.dts
> > r8a7740-armadillo800eva-reference.dts
> > r8a7740-armadillo800eva.dts
> 
> I see.
> I don't know why these defconfigs have "rsize/wsize".
> But, this information was needed on old kernel version somehow (I forgot when, which version),
> and (I guess) there is no such issue now.
> We can remove it ?

Yes, I think we can remove it.
Would you like to make some patches?

Re: [PATCH v6 3/3] ARM: shmobile: lager: enable nfsroot in DTS

[Kuninori Morimoto]

Hi Simon

> Yes, I think we can remove it.
> Would you like to make some patches?

Yes, I can send patches.
But, I can't test emev2-kzm9d board.
Do you have it ?


Best regards
---
Kuninori Morimoto

Re: [PATCH 0/2] ARM: shmobile: remove nfsroot settings

[Kuninori Morimoto]

Hi Simon

> Yes, I can send patches.
> But, I can't test emev2-kzm9d board.
> Do you have it ?

These patches remove nfsroot settings from kzm9d/armadillo dts file.
I tested #1 patch on Armadillo board, but I don't have kzm9d board.

Kuninori Morimoto (2):
      ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
      ARM: shmobile: kzm9d: remove nfsroot settings from bootargs

 arch/arm/boot/dts/emev2-kzm9d-reference.dts        |    2 +-
 arch/arm/boot/dts/emev2-kzm9d.dts                  |    2 +-
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |    2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/2] ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs

[Kuninori Morimoto]

NFS detail settings like "nfsroot=,rsize@96,wsize@96" are no longer needed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |    2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 366f729..c638e4a 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -17,7 +17,7 @@
 	compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
 
 	chosen {
-		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
+		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
 	};
 
 	memory {
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 93da655..426cd9c 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -16,7 +16,7 @@
 	compatible = "renesas,armadillo800eva";
 
 	chosen {
-		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw";
+		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
 	};
 
 	memory {
-- 
1.7.9.5

[PATCH 2/2] ARM: shmobile: kzm9d: remove nfsroot settings from bootargs

[Kuninori Morimoto]

NFS detail settings like "nfsroot=,rsize@96,wsize@96" are no longer needed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/boot/dts/emev2-kzm9d-reference.dts |    2 +-
 arch/arm/boot/dts/emev2-kzm9d.dts           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/emev2-kzm9d-reference.dts b/arch/arm/boot/dts/emev2-kzm9d-reference.dts
index bed676b..cceefda 100644
--- a/arch/arm/boot/dts/emev2-kzm9d-reference.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d-reference.dts
@@ -21,7 +21,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96";
+		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
 	};
 
 	reg_1p8v: regulator@0 {
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index dda13bc..f92e812 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -21,6 +21,6 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96";
+		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
 	};
 };
-- 
1.7.9.5

Re: [PATCH 0/2] ARM: shmobile: remove nfsroot settings

[Kuninori Morimoto]

Hi Simon again

> > Yes, I can send patches.
> > But, I can't test emev2-kzm9d board.
> > Do you have it ?
> 
> These patches remove nfsroot settings from kzm9d/armadillo dts file.
> I tested #1 patch on Armadillo board, but I don't have kzm9d board.

I could test kzm9d board on Magnus's environment.
It works well without "rsize/wsize"

Best regards
---
Kuninori Morimoto

Re: [PATCH 0/2] ARM: shmobile: remove nfsroot settings

[Simon Horman]

On Mon, Aug 05, 2013 at 11:11:56PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon again
> 
> > > Yes, I can send patches.
> > > But, I can't test emev2-kzm9d board.
> > > Do you have it ?
> > 
> > These patches remove nfsroot settings from kzm9d/armadillo dts file.
> > I tested #1 patch on Armadillo board, but I don't have kzm9d board.
> 
> I could test kzm9d board on Magnus's environment.
> It works well without "rsize/wsize"

Thanks, I will test Armadillo.

Re: [PATCH 0/2] ARM: shmobile: remove nfsroot settings

[Kuninori Morimoto]

Hi Simon

> > > > Yes, I can send patches.
> > > > But, I can't test emev2-kzm9d board.
> > > > Do you have it ?
> > > 
> > > These patches remove nfsroot settings from kzm9d/armadillo dts file.
> > > I tested #1 patch on Armadillo board, but I don't have kzm9d board.
> > 
> > I could test kzm9d board on Magnus's environment.
> > It works well without "rsize/wsize"
> 
> Thanks, I will test Armadillo.

Thank you.
But I already tested it on Armadillo :)
It works well

Re: [PATCH 0/2] ARM: shmobile: remove nfsroot settings

[Simon Horman]

On Tue, Aug 06, 2013 at 05:26:06PM +0900, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > > > Yes, I can send patches.
> > > > > But, I can't test emev2-kzm9d board.
> > > > > Do you have it ?
> > > > 
> > > > These patches remove nfsroot settings from kzm9d/armadillo dts file.
> > > > I tested #1 patch on Armadillo board, but I don't have kzm9d board.
> > > 
> > > I could test kzm9d board on Magnus's environment.
> > > It works well without "rsize/wsize"
> > 
> > Thanks, I will test Armadillo.
> 
> Thank you.
> But I already tested it on Armadillo :)
> It works well

Great!

I will queue these changes up for v3.12 in the cleanup3 branch.