From mboxrd@z Thu Jan  1 00:00:00 1970
From: l.stach@pengutronix.de (Lucas Stach)
Date: Wed, 11 Jul 2018 14:17:31 +0200
Subject: [PATCH v3 2/2] ARM: dts: imx6sl: Convert gpc to new bindings
In-Reply-To: <849ea1c3434c87316f15953089633854e01938d6.1531310547.git.leonard.crestez@nxp.com>
References: <cover.1531310547.git.leonard.crestez@nxp.com>
 <849ea1c3434c87316f15953089633854e01938d6.1531310547.git.leonard.crestez@nxp.com>
Message-ID: <1531311451.3163.48.camel@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Am Mittwoch, den 11.07.2018, 15:11 +0300 schrieb Leonard Crestez:
> With old bindings imx_gpc_onecell_data always sets num_domains to 2 so
> the DISPMIX domain can't actually be referenced. The pd is still defined
> and pm core shuts it down as "unused" so display can't work.
> 
> Fix this by converting to new gpc bindings by adding pgc nodes and
> referencing the newly-defined &pu_disp domain from &lcdif.
> 
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> ---
> ?arch/arm/boot/dts/imx6sl.dtsi | 35 +++++++++++++++++++++++++++++++----
> ?1 file changed, 31 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index 102c575a6025..49a56b4fd393 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -698,14 +698,40 @@
> > ?				reg = <0x020dc000 0x4000>;
> > ?				interrupt-controller;
> > ?				#interrupt-cells = <3>;
> > ?				interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
> > ?				interrupt-parent = <&intc>;
> > -				pu-supply = <&reg_pu>;
> > -				clocks = <&clks IMX6SL_CLK_GPU2D_OVG>,
> > -					?<&clks IMX6SL_CLK_GPU2D_PODF>;
> > -				#power-domain-cells = <1>;
> > +				clocks = <&clks IMX6SL_CLK_IPG>;
> > +				clock-names = "ipg";
> +
> > +				pgc {
> > +					#address-cells = <1>;
> > +					#size-cells = <0>;
> +
> > +					power-domain at 0 {
> > +						reg = <0>;
> > +						#power-domain-cells = <0>;
> > +					};
> +
> > > +					pd_pu: power-domain at 1 {
> > +						reg = <1>;
> > +						#power-domain-cells = <0>;
> > +						power-supply = <&reg_pu>;
> > +						clocks = <&clks IMX6SL_CLK_GPU2D_OVG>,
> > +						?????????<&clks IMX6SL_CLK_GPU2D_PODF>;
> > +					};
> +
> > > +					pd_disp: power-domain at 2 {
> > +						reg = <2>;
> > +						#power-domain-cells = <0>;
> > +						clocks = <&clks IMX6SL_CLK_LCDIF_AXI>,
> > +							?<&clks IMX6SL_CLK_LCDIF_PIX>,
> > +							?<&clks IMX6SL_CLK_EPDC_AXI>,
> > +							?<&clks IMX6SL_CLK_EPDC_PIX>,
> > +							?<&clks IMX6SL_CLK_PXP_AXI>;
> > +					};
> > +				};
> > ?			};
> ?
> > > ?			gpr: iomuxc-gpr at 20e0000 {
> > ?				compatible = "fsl,imx6sl-iomuxc-gpr",
> > ?					?????"fsl,imx6q-iomuxc-gpr", "syscon";
> @@ -756,10 +782,11 @@
> > ?				clocks = <&clks IMX6SL_CLK_LCDIF_PIX>,
> > ?					?<&clks IMX6SL_CLK_LCDIF_AXI>,
> > ?					?<&clks IMX6SL_CLK_DUMMY>;
> > ?				clock-names = "pix", "axi", "disp_axi";
> > ?				status = "disabled";
> > +				power-domains = <&pd_disp>;
> > ?			};
> ?
> > > ?			dcp: dcp at 20fc000 {
> > ?				compatible = "fsl,imx6sl-dcp", "fsl,imx28-dcp";
> > ?				reg = <0x020fc000 0x4000>;