[PATCH/RFC 0/6] ARM: shmobile: bockw: Enable SCI and TMU using DT

[PATCH/RFC 0/6] ARM: shmobile: bockw: Enable SCI and TMU using DT

[Simon Horman]

The purpose of this series is to enable SCI and TMU using DT
on the r8a7778 (R-Car M1) based bockw when booting using DT reference.

This is the first batck of work by myself to convert DT reference
board support to initialsie SCI and TMU devices using DT.


This series is depends on patches included in
"[PATCH v4 00/19] Renesas CMT, MTU2 and TMU timers DT support" which
applies on top of renesas-devel-v3.16-rc2-20140628.

The patch "bockw: Initialise SCIF device using DT"
depends on "serial: sh-sci: Add device tree support for r8a7778".

Simon Horman (6):
  ARM: shmobile: r8a7778: add SCI clock support for DT
  ARM: shmobile: r8a7778: Add SCIF nodes
  ARM: shmobile: bockw: Initialise SCIF device using DT
  ARM: shmobile: r8a7778: add TMU clock support for DT
  ARM: shmobile: r8a7778: Add TMU nodes
  ARM: shmobile: bockw: Initialise TMU device using DT

 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 18 +++++-
 arch/arm/boot/dts/r8a7778.dtsi                | 84 +++++++++++++++++++++++++++
 arch/arm/mach-shmobile/clock-r8a7778.c        |  8 +++
 arch/arm/mach-shmobile/setup-r8a7778.c        | 15 +++--
 4 files changed, 114 insertions(+), 11 deletions(-)

-- 
2.0.0.rc2

[PATCH/RFC 1/6] ARM: shmobile: r8a7778: add SCI clock support for DT

[Simon Horman]

This will be used when initialising SCI devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 16bbc94..9557907 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -202,11 +202,17 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
 	CLKDEV_DEV_ID("ffc73000.i2c", &mstp_clks[MSTP027]), /* I2C3 */
 	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
+	CLKDEV_DEV_ID("ffe40000.serial", &mstp_clks[MSTP026]), /* SCIF0 */
 	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
+	CLKDEV_DEV_ID("ffe41000.serial", &mstp_clks[MSTP025]), /* SCIF1 */
 	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
+	CLKDEV_DEV_ID("ffe42000.serial", &mstp_clks[MSTP024]), /* SCIF2 */
 	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
+	CLKDEV_DEV_ID("ffe43000.serial", &mstp_clks[MSTP023]), /* SCIF3 */
 	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
+	CLKDEV_DEV_ID("ffe44000.serial", &mstp_clks[MSTP022]), /* SCIF4 */
 	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
+	CLKDEV_DEV_ID("ffe45000.serial", &mstp_clks[MSTP021]), /* SCIF5 */
 	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 */
-- 
2.0.0.rc2

[PATCH/RFC 1/6] ARM: shmobile: r8a7778: add SCI clock support for DT

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:37 Simon Horman wrote:
> This will be used when initialising SCI devices using DT
> until common clock framework support is added.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/mach-shmobile/clock-r8a7778.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c
> b/arch/arm/mach-shmobile/clock-r8a7778.c index 16bbc94..9557907 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7778.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7778.c
> @@ -202,11 +202,17 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
>  	CLKDEV_DEV_ID("ffc73000.i2c", &mstp_clks[MSTP027]), /* I2C3 */
>  	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
> +	CLKDEV_DEV_ID("ffe40000.serial", &mstp_clks[MSTP026]), /* SCIF0 */
>  	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
> +	CLKDEV_DEV_ID("ffe41000.serial", &mstp_clks[MSTP025]), /* SCIF1 */
>  	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
> +	CLKDEV_DEV_ID("ffe42000.serial", &mstp_clks[MSTP024]), /* SCIF2 */
>  	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
> +	CLKDEV_DEV_ID("ffe43000.serial", &mstp_clks[MSTP023]), /* SCIF3 */
>  	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
> +	CLKDEV_DEV_ID("ffe44000.serial", &mstp_clks[MSTP022]), /* SCIF4 */
>  	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
> +	CLKDEV_DEV_ID("ffe45000.serial", &mstp_clks[MSTP021]), /* SCIF5 */
>  	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 */

-- 
Regards,

Laurent Pinchart

[PATCH/RFC 2/6] ARM: shmobile: r8a7778: Add SCIF nodes

[Simon Horman]

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 3af0a21..55357dc 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -156,6 +156,54 @@
 		status = "disabled";
 	};
 
+	scif0: serial at ffe40000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe40000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	scif1: serial at ffe41000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe41000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	scif2: serial at ffe42000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe42000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	scif3: serial at ffe43000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe43000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	scif4: serial at ffe44000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe44000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
+	scif5: serial at ffe45000 {
+		compatible = "renesas,scif-r8a7778", "renesas,scif";
+		reg = <0xffe45000 0x100>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
 	mmcif: mmc at ffe4e000 {
 		compatible = "renesas,sh-mmcif";
 		reg = <0xffe4e000 0x100>;
-- 
2.0.0.rc2

[PATCH/RFC 2/6] ARM: shmobile: r8a7778: Add SCIF nodes

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:38 Simon Horman wrote:
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Just one small comment below. Apart from that,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/boot/dts/r8a7778.dtsi | 48 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 3af0a21..55357dc 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -156,6 +156,54 @@
>  		status = "disabled";
>  	};
> 
> +	scif0: serial at ffe40000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe40000 0x100>;
> +		interrupt-parent = <&gic>;

The interrupt-parent property is now specified at the top level, so you can 
remove it from the scif nodes.

> +		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
> +	scif1: serial at ffe41000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe41000 0x100>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
> +	scif2: serial at ffe42000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe42000 0x100>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
> +	scif3: serial at ffe43000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe43000 0x100>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
> +	scif4: serial at ffe44000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe44000 0x100>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
> +	scif5: serial at ffe45000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe45000 0x100>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
> +		status = "disabled";
> +	};
> +
>  	mmcif: mmc at ffe4e000 {
>  		compatible = "renesas,sh-mmcif";
>  		reg = <0xffe4e000 0x100>;

-- 
Regards,

Laurent Pinchart

[PATCH/RFC 2/6] ARM: shmobile: r8a7778: Add SCIF nodes

[Sergei Shtylyov]

Hello.

On 07/02/2014 08:28 AM, Simon Horman wrote:

> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/r8a7778.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 48 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 3af0a21..55357dc 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -156,6 +156,54 @@
>   		status = "disabled";
>   	};
>
> +	scif0: serial at ffe40000 {
> +		compatible = "renesas,scif-r8a7778", "renesas,scif";
> +		reg = <0xffe40000 0x100>;
> +		interrupt-parent = <&gic>;

    Not needed here and below -- it's already specified in the root node.

WBR, Sergei

[PATCH/RFC 3/6] ARM: shmobile: bockw: Initialise SCIF device using DT

[Simon Horman]

Initialise SCIF device using DT when booting bockw
using DT reference.

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

---
N.B: This only enables the production serial port (scif0) and not the
debug serial port. It is unclear to me if the debug port is scif1 or scif5.
And if the required PFC support is in place. At the very least the
latter appears to be missing from r8a7778-bockw-reference.dts.
---
 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +++++++++++---
 arch/arm/mach-shmobile/setup-r8a7778.c        | 12 ++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index f76f6ec..5d14688 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -23,6 +23,10 @@
 	model = "bockw";
 	compatible = "renesas,bockw-reference", "renesas,r8a7778";
 
+	aliases {
+		serial0 = &scif0;
+	};
+
 	chosen {
 		bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
 	};
@@ -70,9 +74,6 @@
 };
 
 &pfc {
-	pinctrl-0 = <&scif0_pins>;
-	pinctrl-names = "default";
-
 	scif0_pins: serial0 {
 		renesas,groups = "scif0_data_a", "scif0_ctrl";
 		renesas,function = "scif0";
@@ -124,3 +125,10 @@
 		};
 	};
 };
+
+&scif0 {
+       pinctrl-0 = <&scif0_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 2ccc012..e218c46 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -294,12 +294,6 @@ void __init r8a7778_add_dt_devices(void)
 	}
 #endif
 
-	r8a7778_register_scif(0);
-	r8a7778_register_scif(1);
-	r8a7778_register_scif(2);
-	r8a7778_register_scif(3);
-	r8a7778_register_scif(4);
-	r8a7778_register_scif(5);
 	r8a7778_register_tmu(0);
 }
 
@@ -508,6 +502,12 @@ static void __init r8a7778_register_hpb_dmae(void)
 void __init r8a7778_add_standard_devices(void)
 {
 	r8a7778_add_dt_devices();
+	r8a7778_register_scif(0);
+	r8a7778_register_scif(1);
+	r8a7778_register_scif(2);
+	r8a7778_register_scif(3);
+	r8a7778_register_scif(4);
+	r8a7778_register_scif(5);
 	r8a7778_register_i2c(0);
 	r8a7778_register_i2c(1);
 	r8a7778_register_i2c(2);
-- 
2.0.0.rc2

[PATCH/RFC 3/6] ARM: shmobile: bockw: Initialise SCIF device using DT

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:39 Simon Horman wrote:
> Initialise SCIF device using DT when booting bockw
> using DT reference.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> N.B: This only enables the production serial port (scif0) and not the
> debug serial port. It is unclear to me if the debug port is scif1 or scif5.
> And if the required PFC support is in place. At the very least the
> latter appears to be missing from r8a7778-bockw-reference.dts.

It's missing, but could be easily added :-)

> ---
>  arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +++++++++++---
>  arch/arm/mach-shmobile/setup-r8a7778.c        | 12 ++++++------
>  2 files changed, 17 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> b/arch/arm/boot/dts/r8a7778-bockw-reference.dts index f76f6ec..5d14688
> 100644
> --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> @@ -23,6 +23,10 @@
>  	model = "bockw";
>  	compatible = "renesas,bockw-reference", "renesas,r8a7778";
> 
> +	aliases {
> +		serial0 = &scif0;
> +	};
> +
>  	chosen {
>  		bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs 
ip=dhcp
> rw"; };
> @@ -70,9 +74,6 @@
>  };
> 
>  &pfc {
> -	pinctrl-0 = <&scif0_pins>;
> -	pinctrl-names = "default";
> -
>  	scif0_pins: serial0 {
>  		renesas,groups = "scif0_data_a", "scif0_ctrl";
>  		renesas,function = "scif0";
> @@ -124,3 +125,10 @@
>  		};
>  	};
>  };
> +
> +&scif0 {
> +       pinctrl-0 = <&scif0_pins>;
> +       pinctrl-names = "default";
> +
> +       status = "okay";
> +};
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c
> b/arch/arm/mach-shmobile/setup-r8a7778.c index 2ccc012..e218c46 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -294,12 +294,6 @@ void __init r8a7778_add_dt_devices(void)
>  	}
>  #endif
> 
> -	r8a7778_register_scif(0);
> -	r8a7778_register_scif(1);
> -	r8a7778_register_scif(2);
> -	r8a7778_register_scif(3);
> -	r8a7778_register_scif(4);
> -	r8a7778_register_scif(5);
>  	r8a7778_register_tmu(0);
>  }
> 
> @@ -508,6 +502,12 @@ static void __init r8a7778_register_hpb_dmae(void)
>  void __init r8a7778_add_standard_devices(void)
>  {
>  	r8a7778_add_dt_devices();
> +	r8a7778_register_scif(0);
> +	r8a7778_register_scif(1);
> +	r8a7778_register_scif(2);
> +	r8a7778_register_scif(3);
> +	r8a7778_register_scif(4);
> +	r8a7778_register_scif(5);
>  	r8a7778_register_i2c(0);
>  	r8a7778_register_i2c(1);
>  	r8a7778_register_i2c(2);

-- 
Regards,

Laurent Pinchart

[PATCH/RFC 4/6] ARM: shmobile: r8a7778: add TMU clock support for DT

[Simon Horman]

This will be used when initialising TMU devices using DT
until common clock framework support is added.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 9557907..67980a0 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -244,7 +244,9 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),
 	CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),
 	CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
+	CLKDEV_ICK_ID("fck", "ffd80000.timer", &mstp_clks[MSTP016]),
 	CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
+	CLKDEV_ICK_ID("fck", "ffd81000.timer", &mstp_clks[MSTP015]),
 };
 
 void __init r8a7778_clock_init(void)
-- 
2.0.0.rc2

[PATCH/RFC 4/6] ARM: shmobile: r8a7778: add TMU clock support for DT

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:40 Simon Horman wrote:
> This will be used when initialising TMU devices using DT
> until common clock framework support is added.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/mach-shmobile/clock-r8a7778.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c
> b/arch/arm/mach-shmobile/clock-r8a7778.c index 9557907..67980a0 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7778.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7778.c
> @@ -244,7 +244,9 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),
>  	CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),
>  	CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
> +	CLKDEV_ICK_ID("fck", "ffd80000.timer", &mstp_clks[MSTP016]),
>  	CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
> +	CLKDEV_ICK_ID("fck", "ffd81000.timer", &mstp_clks[MSTP015]),
>  };
> 
>  void __init r8a7778_clock_init(void)

-- 
Regards,

Laurent Pinchart

[PATCH/RFC 5/6] ARM: shmobile: r8a7778: Add TMU nodes

[Simon Horman]

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778.dtsi | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 55357dc..672224f 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -156,6 +156,42 @@
 		status = "disabled";
 	};
 
+	tmu0: timer at ffd80000 {
+		compatible = "renesas,tmu";
+		reg = <0xffd80000 0x30>;
+		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 34 IRQ_TYPE_LEVEL_HIGH>;
+
+		#renesas,channels = <3>;
+
+		status = "disabled";
+	};
+
+	tmu1: timer at ffd81000 {
+		compatible = "renesas,tmu";
+		reg = <0xffd81000 0x30>;
+		interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 38 IRQ_TYPE_LEVEL_HIGH>;
+
+		#renesas,channels = <3>;
+
+		status = "disabled";
+	};
+
+	tmu2: timer at ffd82000 {
+		compatible = "renesas,tmu";
+		reg = <0xffd82000 0x30>;
+		interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 41 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 42 IRQ_TYPE_LEVEL_HIGH>;
+
+		#renesas,channels = <3>;
+
+		status = "disabled";
+	};
+
 	scif0: serial at ffe40000 {
 		compatible = "renesas,scif-r8a7778", "renesas,scif";
 		reg = <0xffe40000 0x100>;
-- 
2.0.0.rc2

[PATCH/RFC 5/6] ARM: shmobile: r8a7778: Add TMU nodes

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:41 Simon Horman wrote:

I've often requested to write a commit message, even for simple patches ;-)

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

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/boot/dts/r8a7778.dtsi | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 55357dc..672224f 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -156,6 +156,42 @@
>  		status = "disabled";
>  	};
> 
> +	tmu0: timer at ffd80000 {
> +		compatible = "renesas,tmu";
> +		reg = <0xffd80000 0x30>;
> +		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 34 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		#renesas,channels = <3>;
> +
> +		status = "disabled";
> +	};
> +
> +	tmu1: timer at ffd81000 {
> +		compatible = "renesas,tmu";
> +		reg = <0xffd81000 0x30>;
> +		interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 38 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		#renesas,channels = <3>;
> +
> +		status = "disabled";
> +	};
> +
> +	tmu2: timer at ffd82000 {
> +		compatible = "renesas,tmu";
> +		reg = <0xffd82000 0x30>;
> +		interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 41 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 42 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		#renesas,channels = <3>;
> +
> +		status = "disabled";
> +	};
> +
>  	scif0: serial at ffe40000 {
>  		compatible = "renesas,scif-r8a7778", "renesas,scif";
>  		reg = <0xffe40000 0x100>;

-- 
Regards,

Laurent Pinchart

[PATCH/RFC 6/6] ARM: shmobile: bockw: Initialise TMU device using DT

[Simon Horman]

Initialise TMU device using DT when booting bockw
using DT-reference.

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

---
N.B: This only enables the production serial port (scif0) and not the
debug serial port. It is unclear to me if the debug port is scif1 or scif5.
And if the required PFC support is in place. At the very least the
latter appears to be missing from r8a7778-bockw-reference.dts.
---
 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 ++++
 arch/arm/mach-shmobile/setup-r8a7778.c        | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 5d14688..b70ef30 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -73,6 +73,10 @@
 	status = "okay";
 };
 
+&tmu0 {
+	status = "okay";
+};
+
 &pfc {
 	scif0_pins: serial0 {
 		renesas,groups = "scif0_data_a", "scif0_ctrl";
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index e218c46..575148d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -293,8 +293,6 @@ void __init r8a7778_add_dt_devices(void)
 		l2x0_init(base, 0x00400000, 0xc20f0fff);
 	}
 #endif
-
-	r8a7778_register_tmu(0);
 }
 
 /* HPB-DMA */
@@ -502,6 +500,7 @@ static void __init r8a7778_register_hpb_dmae(void)
 void __init r8a7778_add_standard_devices(void)
 {
 	r8a7778_add_dt_devices();
+	r8a7778_register_tmu(0);
 	r8a7778_register_scif(0);
 	r8a7778_register_scif(1);
 	r8a7778_register_scif(2);
-- 
2.0.0.rc2

[PATCH/RFC 6/6] ARM: shmobile: bockw: Initialise TMU device using DT

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Wednesday 02 July 2014 06:28:42 Simon Horman wrote:
> Initialise TMU device using DT when booting bockw
> using DT-reference.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> ---
> N.B: This only enables the production serial port (scif0) and not the
> debug serial port. It is unclear to me if the debug port is scif1 or scif5.
> And if the required PFC support is in place. At the very least the
> latter appears to be missing from r8a7778-bockw-reference.dts.

I don't think this comment applies.

> ---
>  arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 ++++
>  arch/arm/mach-shmobile/setup-r8a7778.c        | 3 +--
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> b/arch/arm/boot/dts/r8a7778-bockw-reference.dts index 5d14688..b70ef30
> 100644
> --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
> @@ -73,6 +73,10 @@
>  	status = "okay";
>  };
> 
> +&tmu0 {
> +	status = "okay";
> +};
> +
>  &pfc {
>  	scif0_pins: serial0 {
>  		renesas,groups = "scif0_data_a", "scif0_ctrl";
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c
> b/arch/arm/mach-shmobile/setup-r8a7778.c index e218c46..575148d 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -293,8 +293,6 @@ void __init r8a7778_add_dt_devices(void)
>  		l2x0_init(base, 0x00400000, 0xc20f0fff);
>  	}
>  #endif
> -
> -	r8a7778_register_tmu(0);
>  }
> 
>  /* HPB-DMA */
> @@ -502,6 +500,7 @@ static void __init r8a7778_register_hpb_dmae(void)
>  void __init r8a7778_add_standard_devices(void)
>  {
>  	r8a7778_add_dt_devices();
> +	r8a7778_register_tmu(0);
>  	r8a7778_register_scif(0);
>  	r8a7778_register_scif(1);
>  	r8a7778_register_scif(2);

-- 
Regards,

Laurent Pinchart