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

[Lucas Stach]

Am Freitag, den 11.12.2015, 15:02 +0800 schrieb Shawn Guo:
> 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 at arm.linux.org.uk>
> > Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
> > ---
> >  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>;
> 
> Shouldn't property 'power-domains' be mentioned a bit in bindings doc?
> 
Hm, it's a standard property, so I don't know if it's required. But OTOH
it doesn't hurt to have it, so will add that.

> > +		};
> > +
> >  		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>;
> > +		};
> > +
> 
> Please keep these added nodes sorted in unit-address.
> 
Urgh, right.

Are you okay with merging the DT changes through the DRM tree, or do you
want to pick them separate?

Regards,
Lucas
-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |