[PATCH 13/12] ARM: dts: dove: add DT GPU support

[PATCH 13/12] ARM: dts: dove: add DT GPU support

[Russell King]

Add DT support for the Vivante GC600 GPU on Marvell Dove platforms.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
This additional patch is in conjunction with my PMU (already merged)
and clock driver patch sets.

 arch/arm/boot/dts/dove.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index ea36a262d056..b1d0eb647ed5 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -773,6 +773,16 @@
 				interrupts = <47>;
 				status = "disabled";
 			};
+
+			gpu: gpu at 840000 {
+				clocks = <&divider_clk 1>;
+				clock-names = "core";
+				compatible = "vivante,gc";
+				interrupts = <48>;
+				power-domains = <&gpu_domain>;
+				reg = <0x840000 0x4000>;
+				status = "disabled";
+			};
 		};
 	};
 };
-- 
2.1.0

[PATCH v2 13/12] ARM: dts: dove: add DT GPU support

[Russell King]

Add DT support for the Vivante GC600 GPU on Marvell Dove platforms.
These nodes default to being disabled unless a platform decides they
should be enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
This replaces the previous patch I sent out in error; this version
adds all the DT nodes required.  Also included along with this is a
patch which enables the GPU for Cubox platforms.

This additional patch is in conjunction with my PMU (already merged)
and clock driver patch sets.

 arch/arm/boot/dts/dove.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index ea36a262d056..f36e3b9c6730 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -33,6 +33,12 @@
 		marvell,tauros2-cache-features = <0>;
 	};
 
+	gpu-subsystem {
+		compatible = "marvell,dove-gpu-subsystem";
+		cores = <&gpu>;
+		status = "disabled";
+	};
+
 	i2c-mux {
 		compatible = "i2c-mux-pinctrl";
 		#address-cells = <1>;
@@ -773,6 +779,16 @@
 				interrupts = <47>;
 				status = "disabled";
 			};
+
+			gpu: gpu at 840000 {
+				clocks = <&divider_clk 1>;
+				clock-names = "core";
+				compatible = "vivante,gc";
+				interrupts = <48>;
+				power-domains = <&gpu_domain>;
+				reg = <0x840000 0x4000>;
+				status = "disabled";
+			};
 		};
 	};
 };
-- 
2.1.0

[PATCH v2 14/12] ARM: dts: enable GPU for SolidRun's Cubox

[Russell King]

Enable the GPU for SolidRun's Cubox.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/boot/dts/dove-cubox.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index e6fa251e17b9..af3cb633135f 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -62,6 +62,10 @@
 		pinctrl-0 = <&pmx_gpio_19>;
 		pinctrl-names = "default";
 	};
+
+	gpu-subsystem {
+		status = "okay";
+	};
 };
 
 &uart0 { status = "okay"; };
@@ -74,6 +78,10 @@
 	reg = <1>;
 };
 
+&gpu {
+	status = "okay";
+};
+
 &i2c0 {
 	status = "okay";
 	clock-frequency = <100000>;
-- 
2.1.0

[PATCH v2 13/12] ARM: dts: dove: add DT GPU support

[Andrew Lunn]

> This additional patch is in conjunction with my PMU (already merged)
> and clock driver patch sets.

Hi Russell

Please could you respond to my comment about the clock patch.

http://www.spinics.net/lists/devicetree/msg104464.html

Thanks
	Andrew

[PATCH v2 13/12] ARM: dts: dove: add DT GPU support

[Russell King - ARM Linux]

On Fri, Dec 04, 2015 at 09:49:18PM +0100, Andrew Lunn wrote:
> > This additional patch is in conjunction with my PMU (already merged)
> > and clock driver patch sets.
> 
> Hi Russell
> 
> Please could you respond to my comment about the clock patch.
> 
> http://www.spinics.net/lists/devicetree/msg104464.html

I'm sorry, I haven't had time to look at that your comment yet.  I've
totally forgotten that you made it, or even what the comment was.  I'll
look at it at some point though, if I remember.  That's the best I can
promise.

-- 
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[PATCH 12/12] ARM: dts: imx6: add Vivante GPU nodes

[Russell King - ARM Linux]

On Fri, Dec 04, 2015 at 03:00:04PM +0100, Lucas Stach wrote:
> This adds the device nodes for 2D, 3D and VG GPU cores.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

This should have been copied to the arm-soc people, as we'll need their
acks to keep this part of the series, or it needs to be split from this
series and merged independently.  Also adding lakml.

It'd also be good to add two Dove patches to the set.

> ---
>  arch/arm/boot/dts/imx6dl.dtsi  |  5 +++++
>  arch/arm/boot/dts/imx6q.dtsi   | 15 +++++++++++++++
>  arch/arm/boot/dts/imx6qdl.dtsi | 22 ++++++++++++++++++++++
>  3 files changed, 42 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
> index 4b0ec0703825..51c517a5cafd 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -104,6 +104,11 @@
>  		compatible = "fsl,imx-display-subsystem";
>  		ports = <&ipu1_di0>, <&ipu1_di1>;
>  	};
> +
> +	gpu-subsystem {
> +		compatible = "fsl,imx-gpu-subsystem";
> +		cores = <&gpu_2d>, <&gpu_3d>;
> +	};
>  };
>  
>  &gpt {
> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
> index 399103b8e2c9..77d618b2870c 100644
> --- a/arch/arm/boot/dts/imx6q.dtsi
> +++ b/arch/arm/boot/dts/imx6q.dtsi
> @@ -153,6 +153,16 @@
>  			status = "disabled";
>  		};
>  
> +		gpu_vg: gpu at 02204000 {
> +			compatible = "vivante,gc";
> +			reg = <0x02204000 0x4000>;
> +			interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clks IMX6QDL_CLK_OPENVG_AXI>,
> +				 <&clks IMX6QDL_CLK_GPU2D_CORE>;
> +			clock-names = "bus", "core";
> +			power-domains = <&gpc 1>;
> +		};
> +
>  		ipu2: ipu at 02800000 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
> @@ -225,6 +235,11 @@
>  		compatible = "fsl,imx-display-subsystem";
>  		ports = <&ipu1_di0>, <&ipu1_di1>, <&ipu2_di0>, <&ipu2_di1>;
>  	};
> +
> +	gpu-subsystem {
> +		compatible = "fsl,imx-gpu-subsystem";
> +		cores = <&gpu_2d>, <&gpu_3d>, <&gpu_vg>;
> +	};
>  };
>  
>  &hdmi {
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 2b6cc8bf3c5c..018975b867e1 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -119,6 +119,28 @@
>  			status = "disabled";
>  		};
>  
> +
> +		gpu_2d: gpu at 00134000 {
> +			compatible = "vivante,gc";
> +			reg = <0x00134000 0x4000>;
> +			interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clks IMX6QDL_CLK_GPU2D_AXI>,
> +				 <&clks IMX6QDL_CLK_GPU2D_CORE>;
> +			clock-names = "bus", "core";
> +			power-domains = <&gpc 1>;
> +		};
> +
> +		gpu_3d: gpu at 00130000 {
> +			compatible = "vivante,gc";
> +			reg = <0x00130000 0x4000>;
> +			interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clks IMX6QDL_CLK_GPU3D_AXI>,
> +				 <&clks IMX6QDL_CLK_GPU3D_CORE>,
> +				 <&clks IMX6QDL_CLK_GPU3D_SHADER>;
> +			clock-names = "bus", "core", "shader";
> +			power-domains = <&gpc 1>;
> +		};
> +
>  		hdmi: hdmi at 0120000 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
> -- 
> 2.6.2
> 

-- 
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.