From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
Cc: devel@driverdev.osuosl.org,
Fabio Estevam <fabio.estevam@freescale.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devicetree-discuss@lists.ozlabs.org, kernel@pengutronix.de,
Martin Fuzzey <mfuzzey@parkeon.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Sean Cross <xobs@kosagi.com>, Shawn Guo <shawn.guo@linaro.org>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v3 04/11] ARM i.MX53: fix ldb di divider and selector clocks
Date: Thu, 28 Mar 2013 16:23:28 +0100 [thread overview]
Message-ID: <1364484215-13935-5-git-send-email-p.zabel@pengutronix.de> (raw)
In-Reply-To: <1364484215-13935-1-git-send-email-p.zabel@pengutronix.de>
Use imx_clk_mux_flags and imx_clk_divider_flags to set the appropriate
flags for the LDB display interface divider and selector clocks.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
arch/arm/mach-imx/clk-imx51-imx53.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index d22ee6a..ed08aba 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -420,15 +420,15 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
clk[pll3_sw] = imx_clk_pllv2("pll3_sw", "osc", MX53_DPLL3_BASE);
clk[pll4_sw] = imx_clk_pllv2("pll4_sw", "osc", MX53_DPLL4_BASE);
- clk[ldb_di1_sel] = imx_clk_mux("ldb_di1_sel", MXC_CCM_CSCMR2, 9, 1,
- mx53_ldb_di1_sel, ARRAY_SIZE(mx53_ldb_di1_sel));
clk[ldb_di1_div_3_5] = imx_clk_fixed_factor("ldb_di1_div_3_5", "ldb_di1_sel", 2, 7);
- clk[ldb_di1_div] = imx_clk_divider("ldb_di1_div", "ldb_di1_div_3_5", MXC_CCM_CSCMR2, 11, 1);
+ clk[ldb_di1_div] = imx_clk_divider_flags("ldb_di1_div", "ldb_di1_div_3_5", MXC_CCM_CSCMR2, 11, 1, 0);
+ clk[ldb_di1_sel] = imx_clk_mux_flags("ldb_di1_sel", MXC_CCM_CSCMR2, 9, 1,
+ mx53_ldb_di1_sel, ARRAY_SIZE(mx53_ldb_di1_sel), CLK_SET_RATE_PARENT);
clk[di_pll4_podf] = imx_clk_divider("di_pll4_podf", "pll4_sw", MXC_CCM_CDCDR, 16, 3);
- clk[ldb_di0_sel] = imx_clk_mux("ldb_di0_sel", MXC_CCM_CSCMR2, 8, 1,
- mx53_ldb_di0_sel, ARRAY_SIZE(mx53_ldb_di0_sel));
clk[ldb_di0_div_3_5] = imx_clk_fixed_factor("ldb_di0_div_3_5", "ldb_di0_sel", 2, 7);
- clk[ldb_di0_div] = imx_clk_divider("ldb_di0_div", "ldb_di0_div_3_5", MXC_CCM_CSCMR2, 10, 1);
+ clk[ldb_di0_div] = imx_clk_divider_flags("ldb_di0_div", "ldb_di0_div_3_5", MXC_CCM_CSCMR2, 10, 1, 0);
+ clk[ldb_di0_sel] = imx_clk_mux_flags("ldb_di0_sel", MXC_CCM_CSCMR2, 8, 1,
+ mx53_ldb_di0_sel, ARRAY_SIZE(mx53_ldb_di0_sel), CLK_SET_RATE_PARENT);
clk[ldb_di0_gate] = imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
clk[ldb_di1_gate] = imx_clk_gate2("ldb_di1_gate", "ldb_di1_div", MXC_CCM_CCGR6, 30);
clk[ipu_di0_sel] = imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
--
1.8.2.rc2
next prev parent reply other threads:[~2013-03-28 15:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 15:23 [PATCH v3 0/11] LVDS Display Bridge support for i.MX Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 02/11] ARM i.MX6q: export imx6q_revision Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 03/11] ARM i.MX: Add imx_clk_divider_flags and imx_clk_mux_flags Philipp Zabel
2013-03-28 15:23 ` Philipp Zabel [this message]
2013-03-28 15:23 ` [PATCH v3 05/11] ARM i.MX6q: fix ldb di divider and selector clocks Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 06/11] staging: drm/imx: Add LDB support Philipp Zabel
[not found] ` <1364484215-13935-7-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-06-06 15:16 ` Shawn Guo
2013-06-06 15:54 ` Philipp Zabel
[not found] ` <1370534082.3931.7.camel-/rZezPiN1rtR6QfukMTsflXZhhPuCNm+@public.gmane.org>
2013-06-07 0:26 ` Shawn Guo
2013-06-07 7:40 ` Markus Niebel
2013-06-07 7:54 ` Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 07/11] ARM i.MX6q: Add audio/video PLL post dividers for i.MX6q rev 1.1 Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 08/11] ARM i.MX6q: set the LDB serial clock parent to the video PLL Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 09/11] ARM i.MX53: Add IOMUXC GPR to device tree Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 10/11] ARM i.MX53: Add LDB device " Philipp Zabel
2013-03-28 15:23 ` [PATCH v3 11/11] ARM i.MX6q: " Philipp Zabel
[not found] ` <1364484215-13935-1-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-03-28 15:23 ` [PATCH v3 01/11] ARM i.MX5: Move IPU clock lookups into " Philipp Zabel
2013-03-29 11:19 ` [PATCH v3 0/11] LVDS Display Bridge support for i.MX Shawn Guo
2013-03-30 11:24 ` Philipp Zabel
2013-03-29 11:44 ` 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=1364484215-13935-5-git-send-email-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=fabio.estevam@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mfuzzey@parkeon.com \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.org \
--cc=xobs@kosagi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).