All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: dri-devel@lists.freedesktop.org, shawnguo@kernel.org, stefan@agner.ch
Cc: kernel@pengutronix.de, airlied@linux.ie, daniel.vetter@ffwll.ch,
	jianwei.wang.chn@gmail.com, alison.wang@freescale.com,
	meng.yi@nxp.com, alexander.stein@systec-electronic.com,
	mturquette@baylibre.com, sboyd@codeaurora.org,
	mark.rutland@arm.com, robh+dt@kernel.org, pawel.moll@arm.com,
	ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/8] ARM: imx: clk-vf610: fix DCU clock tree
Date: Mon, 28 Mar 2016 18:59:55 -0700	[thread overview]
Message-ID: <1459216802-32094-2-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1459216802-32094-1-git-send-email-stefan@agner.ch>

Similar to an earlier fix for the SAI clocks, the DCU clock hierarchy
mixes the bus clock with the display controllers pixel clock. Tests
have shown that the gates in CCM_CCGR3/9 registers do not control
the DCU pixel clock, but only the register access clock (bus clock).

Fix this by defining the parent clock of VF610_CLK_DCUx to be the bus
clock (ipg_bus).

Since the clock has not been used far, there are no further changes
needed.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 drivers/clk/imx/clk-vf610.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c
index 0a94d96..426fde2 100644
--- a/drivers/clk/imx/clk-vf610.c
+++ b/drivers/clk/imx/clk-vf610.c
@@ -321,11 +321,11 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
 	clk[VF610_CLK_DCU0_SEL] = imx_clk_mux("dcu0_sel", CCM_CSCMR1, 28, 1, dcu_sels, 2);
 	clk[VF610_CLK_DCU0_EN] = imx_clk_gate("dcu0_en", "dcu0_sel", CCM_CSCDR3, 19);
 	clk[VF610_CLK_DCU0_DIV] = imx_clk_divider("dcu0_div", "dcu0_en", CCM_CSCDR3, 16, 3);
-	clk[VF610_CLK_DCU0] = imx_clk_gate2("dcu0", "dcu0_div", CCM_CCGR3, CCM_CCGRx_CGn(8));
+	clk[VF610_CLK_DCU0] = imx_clk_gate2("dcu0", "ipg_bus", CCM_CCGR3, CCM_CCGRx_CGn(8));
 	clk[VF610_CLK_DCU1_SEL] = imx_clk_mux("dcu1_sel", CCM_CSCMR1, 29, 1, dcu_sels, 2);
 	clk[VF610_CLK_DCU1_EN] = imx_clk_gate("dcu1_en", "dcu1_sel", CCM_CSCDR3, 23);
 	clk[VF610_CLK_DCU1_DIV] = imx_clk_divider("dcu1_div", "dcu1_en", CCM_CSCDR3, 20, 3);
-	clk[VF610_CLK_DCU1] = imx_clk_gate2("dcu1", "dcu1_div", CCM_CCGR9, CCM_CCGRx_CGn(8));
+	clk[VF610_CLK_DCU1] = imx_clk_gate2("dcu1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(8));
 
 	clk[VF610_CLK_ESAI_SEL] = imx_clk_mux("esai_sel", CCM_CSCMR1, 20, 2, esai_sels, 4);
 	clk[VF610_CLK_ESAI_EN] = imx_clk_gate("esai_en", "esai_sel", CCM_CSCDR2, 30);
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: stefan@agner.ch (Stefan Agner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/8] ARM: imx: clk-vf610: fix DCU clock tree
Date: Mon, 28 Mar 2016 18:59:55 -0700	[thread overview]
Message-ID: <1459216802-32094-2-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1459216802-32094-1-git-send-email-stefan@agner.ch>

Similar to an earlier fix for the SAI clocks, the DCU clock hierarchy
mixes the bus clock with the display controllers pixel clock. Tests
have shown that the gates in CCM_CCGR3/9 registers do not control
the DCU pixel clock, but only the register access clock (bus clock).

Fix this by defining the parent clock of VF610_CLK_DCUx to be the bus
clock (ipg_bus).

Since the clock has not been used far, there are no further changes
needed.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 drivers/clk/imx/clk-vf610.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c
index 0a94d96..426fde2 100644
--- a/drivers/clk/imx/clk-vf610.c
+++ b/drivers/clk/imx/clk-vf610.c
@@ -321,11 +321,11 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
 	clk[VF610_CLK_DCU0_SEL] = imx_clk_mux("dcu0_sel", CCM_CSCMR1, 28, 1, dcu_sels, 2);
 	clk[VF610_CLK_DCU0_EN] = imx_clk_gate("dcu0_en", "dcu0_sel", CCM_CSCDR3, 19);
 	clk[VF610_CLK_DCU0_DIV] = imx_clk_divider("dcu0_div", "dcu0_en", CCM_CSCDR3, 16, 3);
-	clk[VF610_CLK_DCU0] = imx_clk_gate2("dcu0", "dcu0_div", CCM_CCGR3, CCM_CCGRx_CGn(8));
+	clk[VF610_CLK_DCU0] = imx_clk_gate2("dcu0", "ipg_bus", CCM_CCGR3, CCM_CCGRx_CGn(8));
 	clk[VF610_CLK_DCU1_SEL] = imx_clk_mux("dcu1_sel", CCM_CSCMR1, 29, 1, dcu_sels, 2);
 	clk[VF610_CLK_DCU1_EN] = imx_clk_gate("dcu1_en", "dcu1_sel", CCM_CSCDR3, 23);
 	clk[VF610_CLK_DCU1_DIV] = imx_clk_divider("dcu1_div", "dcu1_en", CCM_CSCDR3, 20, 3);
-	clk[VF610_CLK_DCU1] = imx_clk_gate2("dcu1", "dcu1_div", CCM_CCGR9, CCM_CCGRx_CGn(8));
+	clk[VF610_CLK_DCU1] = imx_clk_gate2("dcu1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(8));
 
 	clk[VF610_CLK_ESAI_SEL] = imx_clk_mux("esai_sel", CCM_CSCMR1, 20, 2, esai_sels, 4);
 	clk[VF610_CLK_ESAI_EN] = imx_clk_gate("esai_en", "esai_sel", CCM_CSCDR2, 30);
-- 
2.7.4

  reply	other threads:[~2016-03-29  1:59 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-29  1:59 [PATCH v2 0/8] add TCON and Vybrid support Stefan Agner
2016-03-29  1:59 ` Stefan Agner
2016-03-29  1:59 ` Stefan Agner
2016-03-29  1:59 ` Stefan Agner [this message]
2016-03-29  1:59   ` [PATCH v2 1/8] ARM: imx: clk-vf610: fix DCU clock tree Stefan Agner
2016-03-29  1:59 ` [PATCH v2 2/8] ARM: imx: clk-vf610: add TCON ipg clock Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-29  1:59 ` [PATCH v2 3/8] drm/fsl-dcu: disable clock on initialization failure and remove Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-29  1:59 ` [PATCH v2 4/8] drm/fsl-dcu: add extra clock for pixel clock Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-31 14:42   ` Rob Herring
2016-03-31 14:42     ` Rob Herring
2016-03-31 14:42     ` Rob Herring
2016-03-29  1:59 ` [PATCH v2 5/8] drm/fsl-dcu: use common clock framework for pixel clock divider Stefan Agner
2016-03-29  1:59   ` Stefan Agner
2016-03-29  2:00 ` [PATCH v2 6/8] drm/fsl-dcu: add TCON driver Stefan Agner
2016-03-29  2:00   ` Stefan Agner
2016-03-29  6:45   ` Alexander Stein
2016-03-29  6:45     ` Alexander Stein
2016-03-29  6:45     ` Alexander Stein
2016-03-29  7:11     ` Stefan Agner
2016-03-29  7:11       ` Stefan Agner
2016-03-29  7:11       ` Stefan Agner
2016-03-29  7:26       ` Alexander Stein
2016-03-29  7:26         ` Alexander Stein
2016-03-29  7:26         ` Alexander Stein
2016-03-29  7:39         ` Stefan Agner
2016-03-29  7:39           ` Stefan Agner
2016-03-29  7:39           ` Stefan Agner
2016-03-31 14:35   ` Rob Herring
2016-03-31 14:35     ` Rob Herring
2016-03-31 14:35     ` Rob Herring
2016-03-29  2:00 ` [PATCH v2 7/8] ARM: dts: vf610: add display nodes Stefan Agner
2016-03-29  2:00   ` Stefan Agner
2016-03-29  2:00 ` [PATCH v2 8/8] ARM: dts: vf610-colibri: enable display controller Stefan Agner
2016-03-29  2:00   ` Stefan Agner
2016-03-29  2:00   ` Stefan Agner

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=1459216802-32094-2-git-send-email-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=airlied@linux.ie \
    --cc=alexander.stein@systec-electronic.com \
    --cc=alison.wang@freescale.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=jianwei.wang.chn@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=meng.yi@nxp.com \
    --cc=mturquette@baylibre.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=shawnguo@kernel.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: link
Be 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.