mbox

[GIT,PULL] Renesas ARM Based SoC DT DU Updates for v3.19

Message ID cover.1415058552.git.horms+renesas@verge.net.au
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-du-for-v3.19

Message

Simon Horman Nov. 4, 2014, 1:50 a.m. UTC
Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC DT DU updates for v3.19.


The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-du-for-v3.19

for you to fetch changes up to 0ee56d403549fd97d8acac6b7ba3a17f6999c30a:

  ARM: shmobile: koelsch: Enable DU device in DT (2014-10-30 09:47:13 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC DT DU Updates for v3.19

* Enable DU using DT on marzen/r8a7779, lager/r8a7790 and koelsch/r8a7791

----------------------------------------------------------------
Laurent Pinchart (10):
      ARM: shmobile: Remove FSF address from copyright headers
      ARM: shmobile: r8a7779: Add DU node to device tree
      ARM: shmobile: r8a7790: Add DU node to device tree
      ARM: shmobile: r8a7791: Add DU node to device tree
      ARM: shmobile: dts: Add common file for AA104XD12 panel
      ARM: shmobile: marzen: Enable DU device in DT
      ARM: shmobile: lager-reference: Remove DU platform device
      ARM: shmobile: lager: Enable DU device in DT
      ARM: shmobile: koelsch-reference: Remove DU platform device
      ARM: shmobile: koelsch: Enable DU device in DT

 arch/arm/boot/dts/r8a7779-marzen.dts             | 83 ++++++++++++++++++++++
 arch/arm/boot/dts/r8a7779.dtsi                   | 24 +++++++
 arch/arm/boot/dts/r8a7790-lager.dts              | 53 +++++++++++++-
 arch/arm/boot/dts/r8a7790.dtsi                   | 90 ++++++++++++++++++++++++
 arch/arm/boot/dts/r8a7791-koelsch.dts            | 16 ++++-
 arch/arm/boot/dts/r8a7791.dtsi                   | 69 ++++++++++++++++++
 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi   | 41 +++++++++++
 arch/arm/mach-shmobile/board-ape6evm-reference.c |  4 --
 arch/arm/mach-shmobile/board-ape6evm.c           |  4 --
 arch/arm/mach-shmobile/board-armadillo800eva.c   |  5 --
 arch/arm/mach-shmobile/board-bockw-reference.c   |  4 --
 arch/arm/mach-shmobile/board-bockw.c             |  4 --
 arch/arm/mach-shmobile/board-koelsch-reference.c | 77 --------------------
 arch/arm/mach-shmobile/board-koelsch.c           |  4 --
 arch/arm/mach-shmobile/board-kzm9g-reference.c   |  4 --
 arch/arm/mach-shmobile/board-kzm9g.c             |  4 --
 arch/arm/mach-shmobile/board-lager-reference.c   | 84 ----------------------
 arch/arm/mach-shmobile/board-lager.c             |  4 --
 arch/arm/mach-shmobile/board-mackerel.c          |  4 --
 arch/arm/mach-shmobile/board-marzen-reference.c  |  4 --
 arch/arm/mach-shmobile/board-marzen.c            |  4 --
 arch/arm/mach-shmobile/clock-r8a73a4.c           |  4 --
 arch/arm/mach-shmobile/clock-r8a7740.c           |  4 --
 arch/arm/mach-shmobile/clock-r8a7778.c           |  4 --
 arch/arm/mach-shmobile/clock-r8a7779.c           |  4 --
 arch/arm/mach-shmobile/clock-r8a7790.c           |  4 --
 arch/arm/mach-shmobile/clock-r8a7791.c           |  4 --
 arch/arm/mach-shmobile/clock-sh7372.c            |  4 --
 arch/arm/mach-shmobile/clock-sh73a0.c            |  4 --
 arch/arm/mach-shmobile/clock.c                   |  4 --
 arch/arm/mach-shmobile/console.c                 |  4 --
 arch/arm/mach-shmobile/headsmp-scu.S             |  5 --
 arch/arm/mach-shmobile/intc-sh7372.c             |  4 --
 arch/arm/mach-shmobile/intc-sh73a0.c             |  4 --
 arch/arm/mach-shmobile/r8a7740.h                 |  4 --
 arch/arm/mach-shmobile/r8a7778.h                 |  4 --
 arch/arm/mach-shmobile/setup-emev2.c             |  4 --
 arch/arm/mach-shmobile/setup-r7s72100.c          |  4 --
 arch/arm/mach-shmobile/setup-r8a73a4.c           |  4 --
 arch/arm/mach-shmobile/setup-r8a7740.c           |  4 --
 arch/arm/mach-shmobile/setup-r8a7778.c           |  4 --
 arch/arm/mach-shmobile/setup-r8a7779.c           |  4 --
 arch/arm/mach-shmobile/setup-r8a7790.c           |  4 --
 arch/arm/mach-shmobile/setup-r8a7791.c           |  4 --
 arch/arm/mach-shmobile/setup-rcar-gen2.c         |  4 --
 arch/arm/mach-shmobile/setup-sh7372.c            |  4 --
 arch/arm/mach-shmobile/setup-sh73a0.c            |  4 --
 arch/arm/mach-shmobile/sleep-sh7372.S            |  5 --
 arch/arm/mach-shmobile/smp-emev2.c               |  4 --
 arch/arm/mach-shmobile/smp-r8a7779.c             |  4 --
 arch/arm/mach-shmobile/smp-sh73a0.c              |  4 --
 arch/arm/mach-shmobile/timer.c                   |  5 --
 52 files changed, 370 insertions(+), 343 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi

Comments

Sergei Shtylyov Nov. 4, 2014, 1:12 p.m. UTC | #1
Hello.

On 11/4/2014 4:50 AM, Simon Horman wrote:

> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> Add the DU device with a disabled state. Boards that want to enable the
> DU need to specify the output topology.

    OK, but you're also adding VSP1 device node and don't mention that at all.
Haven't you squashed 2 distinct patches by chance?

> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> [horms+renesas@verge.net.au: resolved minor conflict]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/r8a7790.dtsi | 90 ++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 90 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index d0e1773..b7c59b7 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -600,6 +600,96 @@
>   		status = "disabled";
>   	};
>
> +	vsp1@fe920000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe920000 0 0x8000>;
> +		interrupts = <0 266 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;
> +
> +		renesas,has-sru;
> +		renesas,#rpf = <5>;
> +		renesas,#uds = <1>;
> +		renesas,#wpf = <4>;
> +	};
> +
> +	vsp1@fe928000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe928000 0 0x8000>;
> +		interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
> +
> +		renesas,has-lut;
> +		renesas,has-sru;
> +		renesas,#rpf = <5>;
> +		renesas,#uds = <3>;
> +		renesas,#wpf = <4>;
> +	};
> +
> +	vsp1@fe930000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe930000 0 0x8000>;
> +		interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;
> +
> +		renesas,has-lif;
> +		renesas,has-lut;
> +		renesas,#rpf = <4>;
> +		renesas,#uds = <1>;
> +		renesas,#wpf = <4>;
> +	};
> +
> +	vsp1@fe938000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe938000 0 0x8000>;
> +		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;
> +
> +		renesas,has-lif;
> +		renesas,has-lut;
> +		renesas,#rpf = <4>;
> +		renesas,#uds = <1>;
> +		renesas,#wpf = <4>;
> +	};
[...]

WBR, Sergei
Sergei Shtylyov Nov. 4, 2014, 1:14 p.m. UTC | #2
On 11/4/2014 4:50 AM, Simon Horman wrote:

> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> Add the DU device with a disabled state. Boards that want to enable the
> DU need to specify the output topology

   Same question as for the previous patch.

> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/r8a7791.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 69 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> index e06c11f..e4a7170 100644
> --- a/arch/arm/boot/dts/r8a7791.dtsi
> +++ b/arch/arm/boot/dts/r8a7791.dtsi
> @@ -637,6 +637,75 @@
>   		status = "disabled";
>   	};
>
> +	vsp1@fe928000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe928000 0 0x8000>;
> +		interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7791_CLK_VSP1_S>;
> +
> +		renesas,has-lut;
> +		renesas,has-sru;
> +		renesas,#rpf = <5>;
> +		renesas,#uds = <3>;
> +		renesas,#wpf = <4>;
> +	};
> +
> +	vsp1@fe930000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe930000 0 0x8000>;
> +		interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU0>;
> +
> +		renesas,has-lif;
> +		renesas,has-lut;
> +		renesas,#rpf = <4>;
> +		renesas,#uds = <1>;
> +		renesas,#wpf = <4>;
> +	};
> +
> +	vsp1@fe938000 {
> +		compatible = "renesas,vsp1";
> +		reg = <0 0xfe938000 0 0x8000>;
> +		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU1>;
> +
> +		renesas,has-lif;
> +		renesas,has-lut;
> +		renesas,#rpf = <4>;
> +		renesas,#uds = <1>;
> +		renesas,#wpf = <4>;
> +	};
[...]

WBR, Sergei
Simon Horman Nov. 5, 2014, 2:09 a.m. UTC | #3
[CC Olof]

On Tue, Nov 04, 2014 at 04:12:49PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 11/4/2014 4:50 AM, Simon Horman wrote:
> 
> >From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> >Add the DU device with a disabled state. Boards that want to enable the
> >DU need to specify the output topology.
> 
>    OK, but you're also adding VSP1 device node and don't mention that at all.
> Haven't you squashed 2 distinct patches by chance?

Yes, I do appear to have squashed two patches.

Its unclear to me if its worth the delay that respinning this pull-request
would amount to. But I'm happy to do so if that is what Olof would like.

> >Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> >[horms+renesas@verge.net.au: resolved minor conflict]
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  arch/arm/boot/dts/r8a7790.dtsi | 90 ++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 90 insertions(+)
> 
> >diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> >index d0e1773..b7c59b7 100644
> >--- a/arch/arm/boot/dts/r8a7790.dtsi
> >+++ b/arch/arm/boot/dts/r8a7790.dtsi
> >@@ -600,6 +600,96 @@
> >  		status = "disabled";
> >  	};
> >
> >+	vsp1@fe920000 {
> >+		compatible = "renesas,vsp1";
> >+		reg = <0 0xfe920000 0 0x8000>;
> >+		interrupts = <0 266 IRQ_TYPE_LEVEL_HIGH>;
> >+		clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;
> >+
> >+		renesas,has-sru;
> >+		renesas,#rpf = <5>;
> >+		renesas,#uds = <1>;
> >+		renesas,#wpf = <4>;
> >+	};
> >+
> >+	vsp1@fe928000 {
> >+		compatible = "renesas,vsp1";
> >+		reg = <0 0xfe928000 0 0x8000>;
> >+		interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
> >+		clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
> >+
> >+		renesas,has-lut;
> >+		renesas,has-sru;
> >+		renesas,#rpf = <5>;
> >+		renesas,#uds = <3>;
> >+		renesas,#wpf = <4>;
> >+	};
> >+
> >+	vsp1@fe930000 {
> >+		compatible = "renesas,vsp1";
> >+		reg = <0 0xfe930000 0 0x8000>;
> >+		interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;
> >+		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;
> >+
> >+		renesas,has-lif;
> >+		renesas,has-lut;
> >+		renesas,#rpf = <4>;
> >+		renesas,#uds = <1>;
> >+		renesas,#wpf = <4>;
> >+	};
> >+
> >+	vsp1@fe938000 {
> >+		compatible = "renesas,vsp1";
> >+		reg = <0 0xfe938000 0 0x8000>;
> >+		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;
> >+		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;
> >+
> >+		renesas,has-lif;
> >+		renesas,has-lut;
> >+		renesas,#rpf = <4>;
> >+		renesas,#uds = <1>;
> >+		renesas,#wpf = <4>;
> >+	};
> [...]
> 
> WBR, Sergei
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Arnd Bergmann Nov. 19, 2014, 9:33 p.m. UTC | #4
On Tuesday 04 November 2014, Simon Horman wrote:
> Please consider these Renesas ARM based SoC DT DU updates for v3.19.
> 
> 
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> 
>   Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-du-for-v3.19
> 
> for you to fetch changes up to 0ee56d403549fd97d8acac6b7ba3a17f6999c30a:
> 
>   ARM: shmobile: koelsch: Enable DU device in DT (2014-10-30 09:47:13 +0900)
> 

Pulled into next/cleanup, to simplify the dependency chain, thanks!

	Arnd