[PATCH v2 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS

[PATCH v2 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS

[Simon Horman]

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.

v2
* Correct clock suffixes in
  "ARM: shmobile: r8a7779: add HSPI clock support for DT".
  They should be ".spi" to match
  "ARM: shmobile: r8a7779: add HSPI support to DTSI"

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

[PATCH v2 1/3] ARM: shmobile: r8a7779: add HSPI clock support for DT

[Simon Horman]

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>

---
v2
* Correct clock name suffix,
  it should be "spi" to the match subsequent DTS patch.
---
 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..f1fb89b 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.spi", &mstp_clks[MSTP007]), /* HSPI0 */
 	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
+	CLKDEV_DEV_ID("fffc8000.spi", &mstp_clks[MSTP007]), /* HSPI1 */
 	CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
+	CLKDEV_DEV_ID("fffc6000.spi", &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

[PATCH v2 2/3] ARM: shmobile: r8a7779: add HSPI support to DTSI

[Simon Horman]

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

[PATCH v2 3/3] ARM: shmobile: marzen: enable HSPI0 in DTS

[Simon Horman]

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

Re: [PATCH v2 0/3] ARM: shmobile: marzen: enable HSPI0 to DTS

[Simon Horman]

On Tue, Nov 26, 2013 at 04:47:09PM +0900, Simon Horman wrote:
> 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.
> 
> v2
> * Correct clock suffixes in
>   "ARM: shmobile: r8a7779: add HSPI clock support for DT".
>   They should be ".spi" to match
>   "ARM: shmobile: r8a7779: add HSPI support to DTSI"
> 
> 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(+)

I will queue these up.