linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS
@ 2013-11-25  1:00 Simon Horman
  2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Simon Horman @ 2013-11-25  1:00 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

this short series enables HSPI0 in DTS for the r8a7779 based marzen board.
It is based on work by Kuninori Morimoto for the r8a7778 based bockw board.

This series is based on the renesas-devel-v3.13-rc1-20131124 tag
of my renesas tree.


Simon Horman (3):
  ARM: shmobile: r8a7779: add HSPI clock support for DT
  ARM: shmobile: r8a7779: add HSPI support to DTSI
  ARM: shmobile: marzen: enable HSPI0 in DTS

 arch/arm/boot/dts/r8a7779-marzen-reference.dts | 11 ++++++++++
 arch/arm/boot/dts/r8a7779.dtsi                 | 30 ++++++++++++++++++++++++++
 arch/arm/mach-shmobile/clock-r8a7779.c         |  3 +++
 3 files changed, 44 insertions(+)

-- 
1.8.4


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT
  2013-11-25  1:00 [PATCH 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS Simon Horman
@ 2013-11-25  1:00 ` Simon Horman
  2013-11-25  2:15   ` Kuninori Morimoto
  2013-11-25  9:38   ` Sergei Shtylyov
  2013-11-25  1:00 ` [PATCH 2/3] ARM: shmobile: r8a7779: add HSPI support to DTSI Simon Horman
  2013-11-25  1:00 ` [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS Simon Horman
  2 siblings, 2 replies; 9+ messages in thread
From: Simon Horman @ 2013-11-25  1:00 UTC (permalink / raw)
  To: linux-arm-kernel

Based on work for the r8a7778 SoC by Kuninori Morimoto.

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

diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index b7ce0e7..09ca2ea 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -198,8 +198,11 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
 	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
+	CLKDEV_DEV_ID("fffc7000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI0 */
 	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
+	CLKDEV_DEV_ID("fffc8000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI1 */
 	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
+	CLKDEV_DEV_ID("fffc6000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI2 */
 	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
 	CLKDEV_DEV_ID("ffe4c000.sd", &mstp_clks[MSTP323]), /* SDHI0 */
 	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/3] ARM: shmobile: r8a7779: add HSPI support to DTSI
  2013-11-25  1:00 [PATCH 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS Simon Horman
  2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
@ 2013-11-25  1:00 ` Simon Horman
  2013-11-25  1:00 ` [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS Simon Horman
  2 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-11-25  1:00 UTC (permalink / raw)
  To: linux-arm-kernel

Based on work for the r8a7778 SoC by Kuninori Morimoto.

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

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index b2b418a..7af0828 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -42,6 +42,12 @@
 		};
 	};
 
+	aliases {
+		spi0 = &hspi0;
+		spi1 = &hspi1;
+		spi2 = &hspi2;
+	};
+
         gic: interrupt-controller@f0001000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
@@ -248,4 +254,28 @@
 		cap-sdio-irq;
 		status = "disabled";
 	};
+
+	hspi0: spi@fffc7000 {
+		compatible = "renesas,hspi";
+		reg = <0xfffc7000 0x18>;
+		interrupt-controller = <&gic>;
+		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	hspi1: spi@fffc8000 {
+		compatible = "renesas,hspi";
+		reg = <0xfffc8000 0x18>;
+		interrupt-controller = <&gic>;
+		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	hspi2: spi@fffc6000 {
+		compatible = "renesas,hspi";
+		reg = <0xfffc6000 0x18>;
+		interrupt-controller = <&gic>;
+		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
 };
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS
  2013-11-25  1:00 [PATCH 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS Simon Horman
  2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
  2013-11-25  1:00 ` [PATCH 2/3] ARM: shmobile: r8a7779: add HSPI support to DTSI Simon Horman
@ 2013-11-25  1:00 ` Simon Horman
  2013-11-26  2:09   ` Laurent Pinchart
  2 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2013-11-25  1:00 UTC (permalink / raw)
  To: linux-arm-kernel

Based on work for the bockw board by Kuninori Morimoto.

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

diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
index 918085c..76f5eef 100644
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
@@ -97,6 +97,11 @@
 		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
 		renesas,function = "sdhi0";
 	};
+
+	hspi0_pins: hspi0 {
+		renesas,groups = "hspi0";
+		renesas,function = "hspi0";
+	};
 };
 
 &sdhi0 {
@@ -107,3 +112,9 @@
 	bus-width = <4>;
 	status = "okay";
 };
+
+&hspi0 {
+	pinctrl-0 = <&hspi0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT
  2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
@ 2013-11-25  2:15   ` Kuninori Morimoto
  2013-11-25  2:21     ` Simon Horman
  2013-11-25  9:38   ` Sergei Shtylyov
  1 sibling, 1 reply; 9+ messages in thread
From: Kuninori Morimoto @ 2013-11-25  2:15 UTC (permalink / raw)
  To: linux-arm-kernel


Hi Simon

Thank you for this patch

> Based on work for the r8a7778 SoC by Kuninori Morimoto.
> 
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/arm/mach-shmobile/clock-r8a7779.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
> index b7ce0e7..09ca2ea 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7779.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7779.c
> @@ -198,8 +198,11 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
>  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
>  	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
> +	CLKDEV_DEV_ID("fffc7000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI0 */
>  	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
> +	CLKDEV_DEV_ID("fffc8000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI1 */
>  	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
> +	CLKDEV_DEV_ID("fffc6000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI2 */
>  	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
>  	CLKDEV_DEV_ID("ffe4c000.sd", &mstp_clks[MSTP323]), /* SDHI0 */
>  	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */

I guess, [2/3] patch is using

	hspi0: spi@fffc7000 {

So, the correct name is...

 - fffc7000.sh-hspi
 + fffc7000.spi


Best regards
---
Kuninori Morimoto

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT
  2013-11-25  2:15   ` Kuninori Morimoto
@ 2013-11-25  2:21     ` Simon Horman
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-11-25  2:21 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, Nov 24, 2013 at 06:15:26PM -0800, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> Thank you for this patch
> 
> > Based on work for the r8a7778 SoC by Kuninori Morimoto.
> > 
> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  arch/arm/mach-shmobile/clock-r8a7779.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
> > index b7ce0e7..09ca2ea 100644
> > --- a/arch/arm/mach-shmobile/clock-r8a7779.c
> > +++ b/arch/arm/mach-shmobile/clock-r8a7779.c
> > @@ -198,8 +198,11 @@ static struct clk_lookup lookups[] = {
> >  	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
> >  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
> >  	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
> > +	CLKDEV_DEV_ID("fffc7000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI0 */
> >  	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
> > +	CLKDEV_DEV_ID("fffc8000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI1 */
> >  	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
> > +	CLKDEV_DEV_ID("fffc6000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI2 */
> >  	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
> >  	CLKDEV_DEV_ID("ffe4c000.sd", &mstp_clks[MSTP323]), /* SDHI0 */
> >  	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
> 
> I guess, [2/3] patch is using
> 
> 	hspi0: spi@fffc7000 {
> 
> So, the correct name is...
> 
>  - fffc7000.sh-hspi
>  + fffc7000.spi

Thanks, I will fix that.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT
  2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
  2013-11-25  2:15   ` Kuninori Morimoto
@ 2013-11-25  9:38   ` Sergei Shtylyov
  2013-11-26  0:25     ` Simon Horman
  1 sibling, 1 reply; 9+ messages in thread
From: Sergei Shtylyov @ 2013-11-25  9:38 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 25-11-2013 5:00, Simon Horman wrote:

> Based on work for the r8a7778 SoC by Kuninori Morimoto.

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

> diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
> index b7ce0e7..09ca2ea 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7779.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7779.c
> @@ -198,8 +198,11 @@ static struct clk_lookup lookups[] = {
>   	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
>   	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
>   	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
> +	CLKDEV_DEV_ID("fffc7000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI0 */
>   	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
> +	CLKDEV_DEV_ID("fffc8000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI1 */
>   	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
> +	CLKDEV_DEV_ID("fffc6000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI2 */

    The device names here don't seem to match to the device names in the .dtsi 
file.

WBR, Sergei


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT
  2013-11-25  9:38   ` Sergei Shtylyov
@ 2013-11-26  0:25     ` Simon Horman
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-11-26  0:25 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Nov 25, 2013 at 01:38:17PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 25-11-2013 5:00, Simon Horman wrote:
> 
> >Based on work for the r8a7778 SoC by Kuninori Morimoto.
> 
> >Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  arch/arm/mach-shmobile/clock-r8a7779.c | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> >diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
> >index b7ce0e7..09ca2ea 100644
> >--- a/arch/arm/mach-shmobile/clock-r8a7779.c
> >+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
> >@@ -198,8 +198,11 @@ static struct clk_lookup lookups[] = {
> >  	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
> >  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
> >  	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
> >+	CLKDEV_DEV_ID("fffc7000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI0 */
> >  	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
> >+	CLKDEV_DEV_ID("fffc8000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI1 */
> >  	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
> >+	CLKDEV_DEV_ID("fffc6000.sh-hspi", &mstp_clks[MSTP007]), /* HSPI2 */
> 
>    The device names here don't seem to match to the device names in
> the .dtsi file.

Thanks, I will fix that.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS
  2013-11-25  1:00 ` [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS Simon Horman
@ 2013-11-26  2:09   ` Laurent Pinchart
  0 siblings, 0 replies; 9+ messages in thread
From: Laurent Pinchart @ 2013-11-26  2:09 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

Thank you for the patch.

On Monday 25 November 2013 10:00:16 Simon Horman wrote:
> Based on work for the bockw board by Kuninori Morimoto.
> 
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/arm/boot/dts/r8a7779-marzen-reference.dts | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> b/arch/arm/boot/dts/r8a7779-marzen-reference.dts index 918085c..76f5eef
> 100644
> --- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> +++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> @@ -97,6 +97,11 @@
>  		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
>  		renesas,function = "sdhi0";
>  	};
> +
> +	hspi0_pins: hspi0 {
> +		renesas,groups = "hspi0";
> +		renesas,function = "hspi0";
> +	};

What about keeping the nodes in alphabetical order ?

>  };
> 
>  &sdhi0 {
> @@ -107,3 +112,9 @@
>  	bus-width = <4>;
>  	status = "okay";
>  };
> +
> +&hspi0 {
> +	pinctrl-0 = <&hspi0_pins>;
> +	pinctrl-names = "default";
> +	status = "okay";
> +};

And here too ?

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2013-11-26  2:09 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-25  1:00 [PATCH 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS Simon Horman
2013-11-25  1:00 ` [PATCH 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT Simon Horman
2013-11-25  2:15   ` Kuninori Morimoto
2013-11-25  2:21     ` Simon Horman
2013-11-25  9:38   ` Sergei Shtylyov
2013-11-26  0:25     ` Simon Horman
2013-11-25  1:00 ` [PATCH 2/3] ARM: shmobile: r8a7779: add HSPI support to DTSI Simon Horman
2013-11-25  1:00 ` [PATCH 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS Simon Horman
2013-11-26  2:09   ` Laurent Pinchart

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