diff options
author | Liu Ying <Ying.Liu@freescale.com> | 2015-02-12 01:01:28 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2015-03-02 07:52:09 -0500 |
commit | 721fee59d26e46700476f4c70572e9e0f1cc8fd3 (patch) | |
tree | 77f2d35c158697743f91366d5c28a8df67465ed6 | |
parent | 974a7115986ee5d0b2db9cc8cd551e6f88e01378 (diff) |
ARM: imx6q: clk: Change hsi_tx clock to be a shared clock gate
The CG8 field of the CCM CCGR3 register is named as 'mipi_core_cfg'
clock, according to the i.MX6q/sdl reference manuals. This clock is
actually the gate for several clocks, including the hsi_tx_sel clock's
output and the video_27m clock's output. So, this patch changes the
hsi_tx clock to be a shared clock gate.
Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index ab6acd95c0a8..6843ea9707c1 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c | |||
@@ -119,6 +119,7 @@ static unsigned int share_count_asrc; | |||
119 | static unsigned int share_count_ssi1; | 119 | static unsigned int share_count_ssi1; |
120 | static unsigned int share_count_ssi2; | 120 | static unsigned int share_count_ssi2; |
121 | static unsigned int share_count_ssi3; | 121 | static unsigned int share_count_ssi3; |
122 | static unsigned int share_count_mipi_core_cfg; | ||
122 | 123 | ||
123 | static void __init imx6q_clocks_init(struct device_node *ccm_node) | 124 | static void __init imx6q_clocks_init(struct device_node *ccm_node) |
124 | { | 125 | { |
@@ -416,7 +417,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
416 | clk[IMX6QDL_CLK_LDB_DI0] = imx_clk_gate2("ldb_di0", "ldb_di0_podf", base + 0x74, 12); | 417 | clk[IMX6QDL_CLK_LDB_DI0] = imx_clk_gate2("ldb_di0", "ldb_di0_podf", base + 0x74, 12); |
417 | clk[IMX6QDL_CLK_LDB_DI1] = imx_clk_gate2("ldb_di1", "ldb_di1_podf", base + 0x74, 14); | 418 | clk[IMX6QDL_CLK_LDB_DI1] = imx_clk_gate2("ldb_di1", "ldb_di1_podf", base + 0x74, 14); |
418 | clk[IMX6QDL_CLK_IPU2_DI1] = imx_clk_gate2("ipu2_di1", "ipu2_di1_sel", base + 0x74, 10); | 419 | clk[IMX6QDL_CLK_IPU2_DI1] = imx_clk_gate2("ipu2_di1", "ipu2_di1_sel", base + 0x74, 10); |
419 | clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2("hsi_tx", "hsi_tx_podf", base + 0x74, 16); | 420 | clk[IMX6QDL_CLK_HSI_TX] = imx_clk_gate2_shared("hsi_tx", "hsi_tx_podf", base + 0x74, 16, &share_count_mipi_core_cfg); |
420 | if (cpu_is_imx6dl()) | 421 | if (cpu_is_imx6dl()) |
421 | /* | 422 | /* |
422 | * The multiplexer and divider of the imx6q clock gpu2d get | 423 | * The multiplexer and divider of the imx6q clock gpu2d get |