[GIT PULL] Renesas ARM-based SoC bockw board updates for v3.10

[GIT PULL] Renesas ARM-based SoC bockw board updates for v3.10

[Simon Horman]

Hi Olof, Hi Arnd,

The following changes since commit 5e3780ba6dded2636c939549e3bea16d736859fb:

  Merge branch 'soc-r8a7778' into boards-bockw-base (2013-04-05 11:32:38 +0900)

are available in the git repository at:


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

for you to fetch changes up to 446ee9b2d813a9378e304008fc433ce543ca68a1:

  ARM: shmobile: bockw: enable network settings on bootargs (2013-04-05 11:32:53 +0900)

----------------------------------------------------------------
Renesas ARM-based SoC bockw board updates for v3.10

Add SMSC ethernet support to the bockw board.

This pull request is based on a merge of:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7778-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10

The reason for merging with renesas-soc-r8a7778-for-v3.10 is
to provide pre-requisite SoC code to configure IRQ pins for the
SMSC ethernet.

----------------------------------------------------------------
Kuninori Morimoto (2):
      ARM: shmobile: bockw: add SMSC ethernet support
      ARM: shmobile: bockw: enable network settings on bootargs

 arch/arm/boot/dts/r8a7778-bockw.dts  |    2 +-
 arch/arm/mach-shmobile/Kconfig       |    1 +
 arch/arm/mach-shmobile/board-bockw.c |   38 ++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

[PATCH 1/2] ARM: shmobile: bockw: add SMSC ethernet support

[Simon Horman]

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

This patch adds SMSC ethernet support on Bock-W

Bock-W SMSC needs FPGA settings which enables interrupt.
This patch does it on bockw_init() function.
As notes for future, this FPGA settings should be updated,
since this FPGA is using cascaded interrupt.
Current code is assuming that this FPGA interrupt user is only SMSC.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig       |    1 +
 arch/arm/mach-shmobile/board-bockw.c |   38 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 549e059..1a517e2 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -133,6 +133,7 @@ config MACH_BOCKW
 	bool "BOCK-W platform"
 	depends on ARCH_R8A7778
 	select ARCH_REQUIRE_GPIOLIB
+	select RENESAS_INTC_IRQPIN
 	select USE_OF
 
 config MACH_MARZEN
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 56ab56e..38e5e50 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -19,14 +19,52 @@
  */
 
 #include <linux/platform_device.h>
+#include <linux/smsc911x.h>
 #include <mach/common.h>
+#include <mach/irqs.h>
 #include <mach/r8a7778.h>
 #include <asm/mach/arch.h>
 
+static struct smsc911x_platform_config smsc911x_data = {
+	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,
+	.flags		= SMSC911X_USE_32BIT,
+	.phy_interface	= PHY_INTERFACE_MODE_MII,
+};
+
+static struct resource smsc911x_resources[] = {
+	DEFINE_RES_MEM(0x18300000, 0x1000),
+	DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
+};
+
+#define IRQ0MR	0x30
 static void __init bockw_init(void)
 {
+	void __iomem *fpga;
+
 	r8a7778_clock_init();
+	r8a7778_init_irq_extpin(1);
 	r8a7778_add_standard_devices();
+
+	fpga = ioremap_nocache(0x18200000, SZ_1M);
+	if (fpga) {
+		/*
+		 * CAUTION
+		 *
+		 * IRQ0/1 is cascaded interrupt from FPGA.
+		 * it should be cared in the future
+		 * Now, it is assuming IRQ0 was used only from SMSC.
+		 */
+		u16 val = ioread16(fpga + IRQ0MR);
+		val &= ~(1 << 4); /* enable SMSC911x */
+		iowrite16(val, fpga + IRQ0MR);
+		iounmap(fpga);
+
+		platform_device_register_resndata(
+			&platform_bus, "smsc911x", -1,
+			smsc911x_resources, ARRAY_SIZE(smsc911x_resources),
+			&smsc911x_data, sizeof(smsc911x_data));
+	}
 }
 
 static const char *bockw_boards_compat_dt[] __initdata = {
-- 
1.7.10.4

[PATCH 2/2] ARM: shmobile: bockw: enable network settings on bootargs

[Simon Horman]

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

"ip" and "root" settings are useful for development

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778-bockw.dts |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 735c964..0076b1e 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -22,7 +22,7 @@
 	compatible = "renesas,bockw", "renesas,r8a7778";
 
 	chosen {
-		bootargs = "console=ttySC0,115200 ignore_loglevel";
+		bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs";
 	};
 
 	memory {
-- 
1.7.10.4

[PATCH 2/2] ARM: shmobile: bockw: enable boot from shmobile_defconfig

[Kuninori Morimoto]

To enable boot from shmobile_defconfig on Bock-W,
it needs
 - memory started from 0x40000000
 - enable R8A7778
 - enable Bock-W board
 - enable TMU

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/boot/dts/r8a7778-bockw.dts |    2 +-
 arch/arm/configs/shmobile_defconfig |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 0076b1e..1242940 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -27,6 +27,6 @@
 
 	memory {
 		device_type = "memory";
-		reg = <0x60000000 0x10000000>;
+		reg = <0x40000000 0x10000000>;
 	};
 };
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 7dba53f..c1fdff9 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -14,13 +14,14 @@ CONFIG_SLAB=y
 CONFIG_ARCH_SHMOBILE=y
 CONFIG_ARCH_SH7372=y
 CONFIG_ARCH_R8A7740=y
+CONFIG_ARCH_R8A7778=y
 CONFIG_ARCH_R8A7790=y
 CONFIG_ARCH_EMEV2=y
 CONFIG_MACH_MACKEREL=y
 CONFIG_MACH_ARMADILLO800EVA=y
+CONFIG_MACH_BOCKW=y
 CONFIG_MACH_LAGER=y
 CONFIG_MACH_KZM9D=y
-# CONFIG_SH_TIMER_TMU is not set
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_458693=y
-- 
1.7.9.5

Re: [PATCH 2/2] ARM: shmobile: bockw: enable boot from shmobile_defconfig

[Simon Horman]

On Tue, Apr 09, 2013 at 02:37:27AM -0700, Kuninori Morimoto wrote:
> To enable boot from shmobile_defconfig on Bock-W,
> it needs
>  - memory started from 0x40000000
>  - enable R8A7778
>  - enable Bock-W board
>  - enable TMU

I was expecting that the bockw needed to be started at 0x600000000.
Are there any side-effects of using 0x400000000?

If not, then I guess I am happy with this.
But could you split it into two patches?


> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  arch/arm/boot/dts/r8a7778-bockw.dts |    2 +-
>  arch/arm/configs/shmobile_defconfig |    3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
> index 0076b1e..1242940 100644
> --- a/arch/arm/boot/dts/r8a7778-bockw.dts
> +++ b/arch/arm/boot/dts/r8a7778-bockw.dts
> @@ -27,6 +27,6 @@
>  
>  	memory {
>  		device_type = "memory";
> -		reg = <0x60000000 0x10000000>;
> +		reg = <0x40000000 0x10000000>;
>  	};
>  };
> diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
> index 7dba53f..c1fdff9 100644
> --- a/arch/arm/configs/shmobile_defconfig
> +++ b/arch/arm/configs/shmobile_defconfig
> @@ -14,13 +14,14 @@ CONFIG_SLAB=y
>  CONFIG_ARCH_SHMOBILE=y
>  CONFIG_ARCH_SH7372=y
>  CONFIG_ARCH_R8A7740=y
> +CONFIG_ARCH_R8A7778=y
>  CONFIG_ARCH_R8A7790=y
>  CONFIG_ARCH_EMEV2=y
>  CONFIG_MACH_MACKEREL=y
>  CONFIG_MACH_ARMADILLO800EVA=y
> +CONFIG_MACH_BOCKW=y
>  CONFIG_MACH_LAGER=y
>  CONFIG_MACH_KZM9D=y
> -# CONFIG_SH_TIMER_TMU is not set
>  # CONFIG_SWP_EMULATE is not set
>  CONFIG_ARM_ERRATA_430973=y
>  CONFIG_ARM_ERRATA_458693=y
> -- 
> 1.7.9.5
> 

Re: [PATCH 2/2] ARM: shmobile: bockw: enable boot from shmobile_defconfig

[Kuninori Morimoto]

Hi Simon

> > To enable boot from shmobile_defconfig on Bock-W,
> > it needs
> >  - memory started from 0x40000000
> >  - enable R8A7778
> >  - enable Bock-W board
> >  - enable TMU
> 
> I was expecting that the bockw needed to be started at 0x600000000.
> Are there any side-effects of using 0x400000000?

Actually, I'm not good at shmobile_defconfig boot approach detail.
But my understanding is that shmobile_defconfig binary is
assuming Linux kernel is located from 0x400000000 (= CONFIG_MEM_xxx),
and dts :: memory can remap (?) memory if it was 0x400000000 ?

Bock-W couldn't boot if I used 0x600000000 on dts :: memory

> If not, then I guess I am happy with this.
> But could you split it into two patches?

OK, thank you

Best regards
---
Kuninori Morimoto

Re: [PATCH 2/2] ARM: shmobile: bockw: enable boot from shmobile_defconfig

[Simon Horman]

On Tue, Apr 09, 2013 at 06:57:07PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > To enable boot from shmobile_defconfig on Bock-W,
> > > it needs
> > >  - memory started from 0x40000000
> > >  - enable R8A7778
> > >  - enable Bock-W board
> > >  - enable TMU
> > 
> > I was expecting that the bockw needed to be started at 0x600000000.
> > Are there any side-effects of using 0x400000000?
> 
> Actually, I'm not good at shmobile_defconfig boot approach detail.
> But my understanding is that shmobile_defconfig binary is
> assuming Linux kernel is located from 0x400000000 (= CONFIG_MEM_xxx),
> and dts :: memory can remap (?) memory if it was 0x400000000 ?
> 
> Bock-W couldn't boot if I used 0x600000000 on dts :: memory

If the uboot on the bockw supports zImage then it should
be possible to load an image built with shmobile_defconfig
at 0x600000000 and execute it there.

Something like this:

dhcp
tftp 60000000 bockw/zImage
tftp 60f00000 bockw/r8a7778-bockw.dtb
bootz 60000000 - 60f00000

> > If not, then I guess I am happy with this.
> > But could you split it into two patches?
> 
> OK, thank you

Re: [PATCH 2/2] ARM: shmobile: bockw: enable boot from shmobile_defconfig

[Kuninori Morimoto]

Hi Simon

> If the uboot on the bockw supports zImage then it should
> be possible to load an image built with shmobile_defconfig
> at 0x600000000 and execute it there.
> 
> Something like this:
> 
> dhcp
> tftp 60000000 bockw/zImage
> tftp 60f00000 bockw/r8a7778-bockw.dtb
> bootz 60000000 - 60f00000

Hmm...
I tried above, but BockW couldn't boot...

Best regards
---
Kuninori Morimoto

Re: [GIT PULL] Renesas ARM-based SoC bockw board updates for v3.10

[Arnd Bergmann]

On Friday 05 April 2013, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> The following changes since commit 5e3780ba6dded2636c939549e3bea16d736859fb:
> 
>   Merge branch 'soc-r8a7778' into boards-bockw-base (2013-04-05 11:32:38 +0900)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-boards-bockw-for-v3.10
> 
> for you to fetch changes up to 446ee9b2d813a9378e304008fc433ce543ca68a1:
> 
>   ARM: shmobile: bockw: enable network settings on bootargs (2013-04-05 11:32:53 +0900)
> 
> ----------------------------------------------------------------
> Renesas ARM-based SoC bockw board updates for v3.10
> 
> Add SMSC ethernet support to the bockw board.
> 
> This pull request is based on a merge of:
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7778-for-v3.10
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
> 


Pulled into next/boards2, thanks!

	Arnd