[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC DT updates for v4.4.

This pull request is based on
"Renesas ARM Based SoC Cleanup for v4.4, tagged as renesas-cleanup-for-v4.4,
which I have also sent a pull-request for.


The following changes since commit 04418c23a9411b85b8789eab5f4397bcbd62b7b4:

  ARM: shmobile: Remove legacy clock support leftovers (2015-09-14 10:06:56 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.4

for you to fetch changes up to 2529493c288c109cf734235d1eb3de1b23d9bcef:

  ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound (2015-09-14 10:25:58 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC DT Updates for v4.4

* Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
* Tidy up SCI resource region on r8a779[018] SoCs
* Add pinmux for iic0 on Lager board
* Use CCF for audio clock on Lager and Koelsch boards
* Use serial0 and 1 as serial ports on Marzen board
* Use adxl345-specific compatible property for KZM9G board
* Document compat string for Silk board
* Enable GPIO, I2C, QSPI and VIN support on r8a7794/Silk

----------------------------------------------------------------
Geert Uytterhoeven (3):
      ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property
      ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
      ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound

Kuninori Morimoto (5):
      ARM: shmobile: koelsch: use CCF for audio clock
      ARM: shmobile: lager: use CCF for audio clock
      ARM: shmobile: r8a7790: tidyup SSI resource region
      ARM: shmobile: r8a7791: tidyup SSI resource region
      ARM: shmobile: r8a7778: tidyup SSI resource region

Magnus Damm (1):
      ARM: shmobile: marzen: Board specific serial port order

Sergei Shtylyov (8):
      ARM: shmobile: r8a7794: add GPIO clocks
      ARM: shmobile: r8a7794: add GPIO DT support
      ARM: shmobile: r8a7794: add QSPI DT support
      ARM: shmobile: silk: add QSPI DT support
      ARM: shmobile: r8a7794: add I2C DT support
      ARM: shmobile: silk: add I2C1 DT support
      ARM: shmobile: r8a7794: add VIN DT support
      ARM: shmobile: silk: add VIN0/ADV7180 DT support

Simon Horman (1):
      ARM: shmobile: Add silk device tree bindings documentation

Wolfram Sang (1):
      ARM: shmobile: r8a7790: lager: add pinmux for iic0

 Documentation/devicetree/bindings/arm/shmobile.txt |   2 +
 arch/arm/boot/dts/r8a7778.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   6 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  16 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   9 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7794-silk.dts                 |  88 ++++++++
 arch/arm/boot/dts/r8a7794.dtsi                     | 224 ++++++++++++++++++++-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 10 files changed, 338 insertions(+), 17 deletions(-)

[PATCH 01/19] ARM: shmobile: Add silk device tree bindings documentation

[Simon Horman]

Add Silk Device tree bindings Documentation, listing it as a supported board.

This allows to use checkpatch to validate DTSes referring to the Silk board.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 2b9cb62838f2..1d70e78e7c80 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -55,3 +55,5 @@ Boards:
     compatible = "renesas,lager", "renesas,r8a7790"
   - Marzen
     compatible = "renesas,marzen", "renesas,r8a7779"
+  - Silk
+    compatible = "renesas,silk", "renesas,r8a7794";
-- 
2.1.4

[PATCH 02/19] ARM: shmobile: r8a7794: add GPIO clocks

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Describe the GPIO clocks in the R8A7794 device tree.

Based on the original patch by Koji Matsuoka <koji.matsuoka.xm@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 97c8e9ace5eb..b6db773b9e55 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -749,16 +749,22 @@
 		mstp9_clks: mstp9_clks at e6150994 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
-			clocks = <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
-				<&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
+			clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
+				 <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
-			clock-indices = <
-				R8A7794_CLK_QSPI_MOD R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
-				R8A7794_CLK_I2C3 R8A7794_CLK_I2C2 R8A7794_CLK_I2C1
-				R8A7794_CLK_I2C0
-			>;
+			clock-indices = <R8A7794_CLK_GPIO6 R8A7794_CLK_GPIO5
+					 R8A7794_CLK_GPIO4 R8A7794_CLK_GPIO3
+					 R8A7794_CLK_GPIO2 R8A7794_CLK_GPIO1
+					 R8A7794_CLK_GPIO0 R8A7794_CLK_QSPI_MOD
+					 R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
+					 R8A7794_CLK_I2C3 R8A7794_CLK_I2C2
+					 R8A7794_CLK_I2C1 R8A7794_CLK_I2C0>;
 			clock-output-names =
-				"qspi_mod", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
+				"gpio6", "gpio5", "gpio4", "gpio3", "gpio2",
+				"gpio1", "gpio0", "qspi_mod",
+				"i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
 		};
 		mstp11_clks: mstp11_clks at e615099c {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
-- 
2.1.4

[PATCH 03/19] ARM: shmobile: r8a7794: add GPIO DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Describe GPIO[0-6] controllers in the R8A7794 device tree.

Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 91 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b6db773b9e55..e9fab31e0709 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -50,6 +50,97 @@
 		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	gpio0: gpio at e6050000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6050000 0 0x50>;
+		interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 0 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO0>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio1: gpio at e6051000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6051000 0 0x50>;
+		interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 32 26>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO1>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio2: gpio at e6052000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6052000 0 0x50>;
+		interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 64 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO2>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio3: gpio at e6053000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6053000 0 0x50>;
+		interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 96 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO3>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio4: gpio at e6054000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6054000 0 0x50>;
+		interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 128 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO4>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio5: gpio at e6055000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6055000 0 0x50>;
+		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 160 28>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO5>;
+		power-domains = <&cpg_clocks>;
+	};
+
+	gpio6: gpio at e6055400 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6055400 0 0x50>;
+		interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 192 26>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO6>;
+		power-domains = <&cpg_clocks>;
+	};
+
 	cmt0: timer at ffca0000 {
 		compatible = "renesas,cmt-48-gen2";
 		reg = <0 0xffca0000 0 0x1004>;
-- 
2.1.4

[PATCH 04/19] ARM: shmobile: r8a7794: add QSPI DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the generic R8A7794 part of the QSPI device node.

Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e9fab31e0709..e0f32ede2181 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -19,6 +19,10 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	aliases {
+		spi0 = &qspi;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -537,6 +541,20 @@
 		status = "disabled";
 	};
 
+	qspi: spi at e6b10000 {
+		compatible = "renesas,qspi-r8a7794", "renesas,qspi";
+		reg = <0 0xe6b10000 0 0x2c>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_QSPI_MOD>;
+		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+		dma-names = "tx", "rx";
+		power-domains = <&cpg_clocks>;
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	clocks {
 		#address-cells = <2>;
 		#size-cells = <2>;
-- 
2.1.4

[PATCH 05/19] ARM: shmobile: silk: add QSPI DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the SILK board dependent part of the QSPI device node.
Add device nodes  for Spansion  S25FL512S SPI flash and MTD partitions on it.

Based on the original patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 40 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index d4dd5a30ccdf..f49bc00738a3 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -65,6 +65,11 @@
 		renesas,groups = "mmc_data8", "mmc_ctrl";
 		renesas,function = "mmc";
 	};
+
+	qspi_pins: spi0 {
+		renesas,groups = "qspi_ctrl", "qspi_data4";
+		renesas,function = "qspi";
+	};
 };
 
 &scif2 {
@@ -100,3 +105,38 @@
 	non-removable;
 	status = "okay";
 };
+
+&qspi {
+	pinctrl-0 = <&qspi_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	flash at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spansion,s25fl512s", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+		spi-cpol;
+		spi-cpha;
+		m25p,fast-read;
+
+		partition at 0 {
+			label = "loader";
+			reg = <0x00000000 0x00040000>;
+			read-only;
+		};
+		partition at 40000 {
+			label = "user";
+			reg = <0x00040000 0x00400000>;
+			read-only;
+		};
+		partition at 440000 {
+			label = "flash";
+			reg = <0x00440000 0x03bc0000>;
+		};
+	};
+};
-- 
2.1.4

[PATCH 06/19] ARM: shmobile: marzen: Board specific serial port order

[Simon Horman]

From: Magnus Damm <damm+renesas@opensource.se>

Convert Marzen to use board-specific serial0 and serial1 instead
of the older shared SoC-specific SCIF index.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 20afea6f06ef..fe396c8d58db 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -19,12 +19,12 @@
 	compatible = "renesas,marzen", "renesas,r8a7779";
 
 	aliases {
-		serial2 = &scif2;
-		serial4 = &scif4;
+		serial0 = &scif2;
+		serial1 = &scif4;
 	};
 
 	chosen {
-		bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=on";
 		stdout-path = &scif2;
 	};
 
-- 
2.1.4

[PATCH 07/19] ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

Replace the deprecated generic "adi,adxl34x" compatible value by the
adxl345-specific "adi,adxl345" value, cfr. commit e465bf6fc55d5ce2 ("DT:
i2c: Deprecate adi,adxl34x compatible string").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 24b4cd24dceb..7fc5602810ad 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -206,7 +206,7 @@
 	};
 
 	accelerometer at 1d {
-		compatible = "adi,adxl34x";
+		compatible = "adi,adxl345";
 		reg = <0x1d>;
 		interrupt-parent = <&irqpin3>;
 		interrupts = <2 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.1.4

[PATCH 08/19] ARM: shmobile: r8a7794: add I2C DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the generic R8A7794 parts of the I2C[0-5] device nodes.

Based on the original patch by Koji Matsuoka <koji.matsuoka.xm@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 73 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e0f32ede2181..7384db2a3992 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -20,6 +20,12 @@
 	#size-cells = <2>;
 
 	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+		i2c5 = &i2c5;
 		spi0 = &qspi;
 	};
 
@@ -502,6 +508,73 @@
 		status = "disabled";
 	};
 
+	/* The memory map in the User's Manual maps the cores to bus numbers */
+	i2c0: i2c at e6508000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6508000 0 0x40>;
+		interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C0>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c1: i2c at e6518000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6518000 0 0x40>;
+		interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C1>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c2: i2c at e6530000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6530000 0 0x40>;
+		interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C2>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c3: i2c at e6540000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6540000 0 0x40>;
+		interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C3>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c4: i2c at e6520000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6520000 0 0x40>;
+		interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C4>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c5: i2c at e6528000 {
+		compatible = "renesas,i2c-r8a7794";
+		reg = <0 0xe6528000 0 0x40>;
+		interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_I2C5>;
+		power-domains = <&cpg_clocks>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	mmcif0: mmc at ee200000 {
 		compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif";
 		reg = <0 0xee200000 0 0x80>;
-- 
2.1.4

[PATCH 09/19] ARM: shmobile: silk: add I2C1 DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the SILK board dependent part of the I2C1 device node.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index f49bc00738a3..3f808724106e 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -61,6 +61,11 @@
 		renesas,function = "intc";
 	};
 
+	i2c1_pins: i2c1 {
+		renesas,groups = "i2c1";
+		renesas,function = "i2c1";
+	};
+
 	mmcif0_pins: mmcif0 {
 		renesas,groups = "mmc_data8", "mmc_ctrl";
 		renesas,function = "mmc";
@@ -95,6 +100,14 @@
 	};
 };
 
+&i2c1 {
+	pinctrl-0 = <&i2c1_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	clock-frequency = <400000>;
+};
+
 &mmcif0 {
 	pinctrl-0 = <&mmcif0_pins>;
 	pinctrl-names = "default";
-- 
2.1.4

[PATCH 10/19] ARM: shmobile: r8a7794: add VIN DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the generic R8A7794 part of the VIN[01] device nodes. Add aliases for
the VIN[01] device nodes.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 7384db2a3992..e54f3dea2d70 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -27,6 +27,8 @@
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
 		spi0 = &qspi;
+		vin0 = &vin0;
+		vin1 = &vin1;
 	};
 
 	cpus {
@@ -628,6 +630,24 @@
 		status = "disabled";
 	};
 
+	vin0: video at e6ef0000 {
+		compatible = "renesas,vin-r8a7794";
+		reg = <0 0xe6ef0000 0 0x1000>;
+		interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp8_clks R8A7794_CLK_VIN0>;
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
+	vin1: video at e6ef1000 {
+		compatible = "renesas,vin-r8a7794";
+		reg = <0 0xe6ef1000 0 0x1000>;
+		interrupts = <0 189 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp8_clks R8A7794_CLK_VIN1>;
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
 	clocks {
 		#address-cells = <2>;
 		#size-cells = <2>;
-- 
2.1.4

[PATCH 11/19] ARM: shmobile: silk: add VIN0/ADV7180 DT support

[Simon Horman]

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define  the  SILK board dependent part of the  VIN0  device  node.
Add the device node for Analog Devices ADV7180 video decoder to I2C1 bus.
Add the necessary subnodes to interconnect VIN0 and ADV7180 devices.

Based on the Henninger VIN0/ADV8170 device tree patch by myself.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 3f808724106e..bb0a22423dc4 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -75,6 +75,11 @@
 		renesas,groups = "qspi_ctrl", "qspi_data4";
 		renesas,function = "qspi";
 	};
+
+	vin0_pins: vin0 {
+		renesas,groups = "vin0_data8", "vin0_clk";
+		renesas,function = "vin0";
+	};
 };
 
 &scif2 {
@@ -106,6 +111,19 @@
 
 	status = "okay";
 	clock-frequency = <400000>;
+
+	composite-in at 20 {
+		compatible = "adi,adv7180";
+		reg = <0x20>;
+		remote = <&vin0>;
+
+		port {
+			adv7180: endpoint {
+				bus-width = <8>;
+				remote-endpoint = <&vin0ep>;
+			};
+		};
+	};
 };
 
 &mmcif0 {
@@ -153,3 +171,20 @@
 		};
 	};
 };
+
+/* composite video input */
+&vin0 {
+	status = "okay";
+	pinctrl-0 = <&vin0_pins>;
+	pinctrl-names = "default";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		vin0ep: endpoint {
+			remote-endpoint = <&adv7180>;
+			bus-width = <8>;
+		};
+	};
+};
-- 
2.1.4

[PATCH 12/19] ARM: shmobile: koelsch: use CCF for audio clock

[Simon Horman]

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

Because of historical reason, audio clock didn't use CCF.
Let's use it now.

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

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index dc158845afdc..fc44ea361a4b 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -242,6 +242,13 @@
 			  1800000 0>;
 	};
 
+	audio_clock: clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <11289600>;
+		clock-output-names = "audio_clock";
+	};
+
 	rsnd_ak4643: sound {
 		compatible = "simple-audio-card";
 
@@ -255,7 +262,7 @@
 
 		sndcodec: simple-audio-card,codec {
 			sound-dai = <&ak4643>;
-			system-clock-frequency = <11289600>;
+			clocks = <&audio_clock>;
 		};
 	};
 
-- 
2.1.4

[PATCH 13/19] ARM: shmobile: lager: use CCF for audio clock

[Simon Horman]

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

Because of historical reason, audio clock didn't use CCF.
Let's use it now.

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

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 37dec5269491..6f5d7f50d5ca 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -174,6 +174,13 @@
 			  1800000 0>;
 	};
 
+	audio_clock: clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <11289600>;
+		clock-output-names = "audio_clock";
+	};
+
 	rsnd_ak4643: sound {
 		compatible = "simple-audio-card";
 
@@ -187,7 +194,7 @@
 
 		sndcodec: simple-audio-card,codec {
 			sound-dai = <&ak4643>;
-			system-clock-frequency = <11289600>;
+			clocks = <&audio_clock>;
 		};
 	};
 
-- 
2.1.4

[PATCH 14/19] ARM: shmobile: r8a7790: tidyup SSI resource region

[Simon Horman]

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a0b2a79cbfbd..ae5eb281d43a 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1599,7 +1599,7 @@
 		reg =	<0 0xec500000 0 0x1000>, /* SCU */
 			<0 0xec5a0000 0 0x100>,  /* ADG */
 			<0 0xec540000 0 0x1000>, /* SSIU */
-			<0 0xec541000 0 0x1280>, /* SSI */
+			<0 0xec541000 0 0x280>,  /* SSI */
 			<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
 		reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
 
-- 
2.1.4

[PATCH 15/19] ARM: shmobile: r8a7791: tidyup SSI resource region

[Simon Horman]

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 831525dd39a6..3b8e26dde36d 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1649,7 +1649,7 @@
 		reg =	<0 0xec500000 0 0x1000>, /* SCU */
 			<0 0xec5a0000 0 0x100>,  /* ADG */
 			<0 0xec540000 0 0x1000>, /* SSIU */
-			<0 0xec541000 0 0x1280>, /* SSI */
+			<0 0xec541000 0 0x280>,  /* SSI */
 			<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
 		reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
 
-- 
2.1.4

[PATCH 16/19] ARM: shmobile: r8a7778: tidyup SSI resource region

[Simon Horman]

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7778.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4b1fa9f42ad5..4f8e07811746 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -239,7 +239,7 @@
 		#sound-dai-cells = <1>;
 		compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1";
 		reg =	<0xffd90000 0x1000>,	/* SRU */
-			<0xffd91000 0x1240>,	/* SSI */
+			<0xffd91000 0x240>,	/* SSI */
 			<0xfffe0000 0x24>;	/* ADG */
 		clocks = <&mstp3_clks R8A7778_CLK_SSI8>,
 			<&mstp3_clks R8A7778_CLK_SSI7>,
-- 
2.1.4

[PATCH 17/19] ARM: shmobile: r8a7790: lager: add pinmux for iic0

[Simon Horman]

From: Wolfram Sang <wsa@sang-engineering.com>

It seems we used to rely on the default pinmux setting of this HW, but
currently we need to explicitly set the pinmux to access this bus. It is
better style, too.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6f5d7f50d5ca..c553abd711ee 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -342,6 +342,11 @@
 		renesas,function = "msiof1";
 	};
 
+	iic0_pins: iic0 {
+		renesas,groups = "iic0";
+		renesas,function = "iic0";
+	};
+
 	iic1_pins: iic1 {
 		renesas,groups = "iic1";
 		renesas,function = "iic1";
@@ -517,6 +522,8 @@
 
 &iic0	{
 	status = "okay";
+	pinctrl-0 = <&iic0_pins>;
+	pinctrl-names = "default";
 };
 
 &iic1	{
-- 
2.1.4

[PATCH 18/19] ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

484adb005886 ("ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain")
added CPG/MSTP clock-cells domain support, but it was missing sound
support. This patch adds it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms: Updated commit id referred to in changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index ae5eb281d43a..e07ae5d45e19 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1627,6 +1627,7 @@
 				"mix.0", "mix.1",
 				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
+		power-domains = <&cpg_clocks>;
 
 		status = "disabled";
 
-- 
2.1.4

[PATCH 19/19] ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

797a0626e08c ("ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain")
added CPG/MSTP clock-cells domain support, but it was missing sound
support. This patch adds it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms: updated commit id referred to in changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 3b8e26dde36d..328f48bd15e7 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1677,6 +1677,7 @@
 				"mix.0", "mix.1",
 				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
+		power-domains = <&cpg_clocks>;
 
 		status = "disabled";
 
-- 
2.1.4

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Geert Uytterhoeven]

Hi Simon,

On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Renesas ARM Based SoC DT Updates for v4.4
>
> * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs

>       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
>       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound

These two should actually go in in v4.3, as they're bugfixes for commits that
are in v4.3-rc1. That can be done in parallel, though.

Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
sh-drivers-for-v4.3 enters mainline.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Arnd Bergmann]

On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
> 
> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > Renesas ARM Based SoC DT Updates for v4.4
> >
> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> 
> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> 
> These two should actually go in in v4.3, as they're bugfixes for commits that
> are in v4.3-rc1. That can be done in parallel, though.
> 
> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> sh-drivers-for-v4.3 enters mainline.
> 

The commits are on the top of the branch, so we could just remove them
here and apply them to the fixes branch if you like.

	Arnd

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Geert Uytterhoeven]

Hi Arnd,

On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
>> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
>> <horms+renesas@verge.net.au> wrote:
>> > Renesas ARM Based SoC DT Updates for v4.4
>> >
>> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
>>
>> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
>> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
>>
>> These two should actually go in in v4.3, as they're bugfixes for commits that
>> are in v4.3-rc1. That can be done in parallel, though.
>>
>> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
>> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
>> sh-drivers-for-v4.3 enters mainline.
>
> The commits are on the top of the branch, so we could just remove them
> here and apply them to the fixes branch if you like.

That sounds fine to me, thanks!

Simon, is that OK for you?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

On Fri, Sep 18, 2015 at 09:16:31AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > Renesas ARM Based SoC DT Updates for v4.4
> >
> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> 
> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> 
> These two should actually go in in v4.3, as they're bugfixes for commits that
> are in v4.3-rc1. That can be done in parallel, though.

Thanks, I'll resubmit those patches as fixes and revise
this pull request accordingly.

> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> sh-drivers-for-v4.3 enters mainline.

I sent a pull-request for that yesterday, so presumably that will be soon.

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

On Fri, Sep 18, 2015 at 09:21:54AM +0200, Arnd Bergmann wrote:
> On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
> > 
> > On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> > <horms+renesas@verge.net.au> wrote:
> > > Renesas ARM Based SoC DT Updates for v4.4
> > >
> > > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> > 
> > >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> > >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> > 
> > These two should actually go in in v4.3, as they're bugfixes for commits that
> > are in v4.3-rc1. That can be done in parallel, though.
> > 
> > Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> > ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> > sh-drivers-for-v4.3 enters mainline.
> > 
> 
> The commits are on the top of the branch, so we could just remove them
> here and apply them to the fixes branch if you like.

Thanks, that would be wonderful.

Would you also like me to resubmit this pull request with the top two
patches removed?

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote:
> Hi Arnd,
> 
> On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
> >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> >> <horms+renesas@verge.net.au> wrote:
> >> > Renesas ARM Based SoC DT Updates for v4.4
> >> >
> >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> >>
> >> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> >> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> >>
> >> These two should actually go in in v4.3, as they're bugfixes for commits that
> >> are in v4.3-rc1. That can be done in parallel, though.
> >>
> >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> >> sh-drivers-for-v4.3 enters mainline.
> >
> > The commits are on the top of the branch, so we could just remove them
> > here and apply them to the fixes branch if you like.
> 
> That sounds fine to me, thanks!
> 
> Simon, is that OK for you?

Yes, perfectly fine.

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

Hi Arnd,

On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote:
> On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote:
> > Hi Arnd,
> > 
> > On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
> > >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> > >> <horms+renesas@verge.net.au> wrote:
> > >> > Renesas ARM Based SoC DT Updates for v4.4
> > >> >
> > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> > >>
> > >> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> > >> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> > >>
> > >> These two should actually go in in v4.3, as they're bugfixes for commits that
> > >> are in v4.3-rc1. That can be done in parallel, though.
> > >>
> > >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> > >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> > >> sh-drivers-for-v4.3 enters mainline.
> > >
> > > The commits are on the top of the branch, so we could just remove them
> > > here and apply them to the fixes branch if you like.
> > 
> > That sounds fine to me, thanks!
> > 
> > Simon, is that OK for you?
> 
> Yes, perfectly fine.

I am wondering if you need anything from me at this point.

[PATCH 01/19] ARM: shmobile: Add silk device tree bindings documentation

[Sergei Shtylyov]

On 09/18/2015 03:47 AM, Simon Horman wrote:

> Add Silk Device tree bindings Documentation, listing it as a supported board.
>
> This allows to use checkpatch to validate DTSes referring to the Silk board.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>   Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
> index 2b9cb62838f2..1d70e78e7c80 100644
> --- a/Documentation/devicetree/bindings/arm/shmobile.txt
> +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
> @@ -55,3 +55,5 @@ Boards:
>       compatible = "renesas,lager", "renesas,r8a7790"
>     - Marzen
>       compatible = "renesas,marzen", "renesas,r8a7779"
> +  - Silk

    I'll have to fix this up to SILK (RTP0RC7794LCB00011S). Sorry, noticed too 
late. :-(

MBR, Sergei

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

Hi Arnd,

On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote:
> Hi Arnd,
> 
> On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote:
> > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote:
> > > Hi Arnd,
> > > 
> > > On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > > > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote:
> > > >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman
> > > >> <horms+renesas@verge.net.au> wrote:
> > > >> > Renesas ARM Based SoC DT Updates for v4.4
> > > >> >
> > > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
> > > >>
> > > >> >       ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
> > > >> >       ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound
> > > >>
> > > >> These two should actually go in in v4.3, as they're bugfixes for commits that
> > > >> are in v4.3-rc1. That can be done in parallel, though.
> > > >>
> > > >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3
> > > >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in
> > > >> sh-drivers-for-v4.3 enters mainline.
> > > >
> > > > The commits are on the top of the branch, so we could just remove them
> > > > here and apply them to the fixes branch if you like.
> > > 
> > > That sounds fine to me, thanks!
> > > 
> > > Simon, is that OK for you?
> > 
> > Yes, perfectly fine.
> 
> I am wondering if you need anything from me at this point.

In the interest of moving things forwards I am:

* Withdrawing this pull request
* Preparing a pull request with only the fixes

I will also prepare an updated, v2, version of this pull request
without the fixes and with some new patches I have queued-up in
the mean time.

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Arnd Bergmann]

On Friday 02 October 2015 11:28:39 Simon Horman wrote:
> > > 
> > > Yes, perfectly fine.
> > 
> > I am wondering if you need anything from me at this point.
> 
> In the interest of moving things forwards I am:
> 
> * Withdrawing this pull request
> * Preparing a pull request with only the fixes
> 
> I will also prepare an updated, v2, version of this pull request
> without the fixes and with some new patches I have queued-up in
> the mean time.

Hi Simon,

I'm very sorry for dropping the ball here. I'm definitely fine with this,
I just screwed up and didn't do any merges at all since I returned from
my leave, and Olof was also busy otherwise this week.

	Arnd

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

On Sat, Oct 03, 2015 at 12:18:00AM +0200, Arnd Bergmann wrote:
> On Friday 02 October 2015 11:28:39 Simon Horman wrote:
> > > > 
> > > > Yes, perfectly fine.
> > > 
> > > I am wondering if you need anything from me at this point.
> > 
> > In the interest of moving things forwards I am:
> > 
> > * Withdrawing this pull request
> > * Preparing a pull request with only the fixes
> > 
> > I will also prepare an updated, v2, version of this pull request
> > without the fixes and with some new patches I have queued-up in
> > the mean time.
> 
> Hi Simon,
> 
> I'm very sorry for dropping the ball here. I'm definitely fine with this,
> I just screwed up and didn't do any merges at all since I returned from
> my leave, and Olof was also busy otherwise this week.

Hi And

No problem. I assumed you were busy with something.

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Arnd Bergmann]

On Friday 02 October 2015 11:28:39 Simon Horman wrote:
> On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote:
> > On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote:
> > > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote:
> > > Yes, perfectly fine.
> > 
> > I am wondering if you need anything from me at this point.
> 
> In the interest of moving things forwards I am:
> 
> * Withdrawing this pull request
> * Preparing a pull request with only the fixes
> 
> I will also prepare an updated, v2, version of this pull request
> without the fixes and with some new patches I have queued-up in
> the mean time.
> 

As you noticed, I have finally started merging stuff now. Based on
your mail here, I'm waiting for v2 of this pull request now, but
I can also apply the remaining patches as I suggested earlier if
you prefer.

	Arnd

[GIT PULL] Renesas ARM Based SoC DT Updates for v4.4

[Simon Horman]

On Tue, Oct 06, 2015 at 04:39:08PM +0200, Arnd Bergmann wrote:
> On Friday 02 October 2015 11:28:39 Simon Horman wrote:
> > On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote:
> > > On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote:
> > > > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote:
> > > > Yes, perfectly fine.
> > > 
> > > I am wondering if you need anything from me at this point.
> > 
> > In the interest of moving things forwards I am:
> > 
> > * Withdrawing this pull request
> > * Preparing a pull request with only the fixes
> > 
> > I will also prepare an updated, v2, version of this pull request
> > without the fixes and with some new patches I have queued-up in
> > the mean time.
> > 
> 
> As you noticed, I have finally started merging stuff now. Based on
> your mail here, I'm waiting for v2 of this pull request now, but
> I can also apply the remaining patches as I suggested earlier if
> you prefer.

Please wait for v2, I'll send it out soon.