From: Lucas Stach <l.stach@pengutronix.de> To: Leonard Crestez <leonard.crestez@nxp.com>, Ulf Hansson <ulf.hansson@linaro.org>, Shawn Guo <shawnguo@kernel.org> Cc: Fabio Estevam <fabio.estevam@nxp.com>, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de Subject: Re: [PATCH v3 2/2] ARM: dts: imx6sl: Convert gpc to new bindings Date: Wed, 11 Jul 2018 14:17:31 +0200 [thread overview] Message-ID: <1531311451.3163.48.camel@pengutronix.de> (raw) In-Reply-To: <849ea1c3434c87316f15953089633854e01938d6.1531310547.git.leonard.crestez@nxp.com> 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 = <®_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@0 { > > + reg = <0>; > > + #power-domain-cells = <0>; > > + }; > + > > > + pd_pu: power-domain@1 { > > + reg = <1>; > > + #power-domain-cells = <0>; > > + power-supply = <®_pu>; > > + clocks = <&clks IMX6SL_CLK_GPU2D_OVG>, > > + <&clks IMX6SL_CLK_GPU2D_PODF>; > > + }; > + > > > + pd_disp: power-domain@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@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@20fc000 { > > compatible = "fsl,imx6sl-dcp", "fsl,imx28-dcp"; > > reg = <0x020fc000 0x4000>;
WARNING: multiple messages have this Message-ID (diff)
From: l.stach@pengutronix.de (Lucas Stach) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/2] ARM: dts: imx6sl: Convert gpc to new bindings Date: Wed, 11 Jul 2018 14:17:31 +0200 [thread overview] Message-ID: <1531311451.3163.48.camel@pengutronix.de> (raw) In-Reply-To: <849ea1c3434c87316f15953089633854e01938d6.1531310547.git.leonard.crestez@nxp.com> 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 = <®_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 = <®_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>;
next prev parent reply other threads:[~2018-07-11 12:17 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-11 12:11 [PATCH v3 0/2] Fix imx6sl display power domain Leonard Crestez 2018-07-11 12:11 ` Leonard Crestez 2018-07-11 12:11 ` Leonard Crestez 2018-07-11 12:11 ` [PATCH v3 1/2] soc: imx: gpc: Disable 6sl display power gating for ERR006287 Leonard Crestez 2018-07-11 12:11 ` Leonard Crestez 2018-07-11 12:16 ` Lucas Stach 2018-07-11 12:16 ` Lucas Stach 2018-07-11 12:21 ` Leonard Crestez 2018-07-11 12:21 ` Leonard Crestez 2018-07-11 12:29 ` Lucas Stach 2018-07-11 12:29 ` Lucas Stach 2018-07-11 12:19 ` Ulf Hansson 2018-07-11 12:19 ` Ulf Hansson 2018-07-11 12:11 ` [PATCH v3 2/2] ARM: dts: imx6sl: Convert gpc to new bindings Leonard Crestez 2018-07-11 12:11 ` Leonard Crestez 2018-07-11 12:17 ` Lucas Stach [this message] 2018-07-11 12:17 ` Lucas Stach 2018-07-11 13:20 ` [PATCH v3 0/2] Fix imx6sl display power domain Shawn Guo 2018-07-11 13:20 ` Shawn Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1531311451.3163.48.camel@pengutronix.de \ --to=l.stach@pengutronix.de \ --cc=fabio.estevam@nxp.com \ --cc=kernel@pengutronix.de \ --cc=leonard.crestez@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=shawnguo@kernel.org \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.