Skip to content

Commit

Permalink
ARM: clk-imx6q: refine clock tree for ASRC
Browse files Browse the repository at this point in the history
ASRC has "asrc", "asrc_ipg", "asrc_mem" clocks, and they share
the same gate bits.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
  • Loading branch information
Shengjiu Wang authored and Shawn Guo committed Sep 16, 2014
1 parent e37c1ad commit aec247d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion arch/arm/mach-imx/clk-imx6q.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ static struct clk_div_table video_div_table[] = {
};

static unsigned int share_count_esai;
static unsigned int share_count_asrc;

static void __init imx6q_clocks_init(struct device_node *ccm_node)
{
Expand Down Expand Up @@ -317,7 +318,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)

/* name parent_name reg shift */
clk[IMX6QDL_CLK_APBH_DMA] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
clk[IMX6QDL_CLK_ASRC] = imx_clk_gate2("asrc", "asrc_podf", base + 0x68, 6);
clk[IMX6QDL_CLK_ASRC] = imx_clk_gate2_shared("asrc", "asrc_podf", base + 0x68, 6, &share_count_asrc);
clk[IMX6QDL_CLK_ASRC_IPG] = imx_clk_gate2_shared("asrc_ipg", "ahb", base + 0x68, 6, &share_count_asrc);
clk[IMX6QDL_CLK_ASRC_MEM] = imx_clk_gate2_shared("asrc_mem", "ahb", base + 0x68, 6, &share_count_asrc);
clk[IMX6QDL_CLK_CAN1_IPG] = imx_clk_gate2("can1_ipg", "ipg", base + 0x68, 14);
clk[IMX6QDL_CLK_CAN1_SERIAL] = imx_clk_gate2("can1_serial", "can_root", base + 0x68, 16);
clk[IMX6QDL_CLK_CAN2_IPG] = imx_clk_gate2("can2_ipg", "ipg", base + 0x68, 18);
Expand Down
4 changes: 3 additions & 1 deletion include/dt-bindings/clock/imx6qdl-clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@
#define IMX6QDL_CLK_LVDS2_GATE 207
#define IMX6QDL_CLK_ESAI_IPG 208
#define IMX6QDL_CLK_ESAI_MEM 209
#define IMX6QDL_CLK_END 210
#define IMX6QDL_CLK_ASRC_IPG 210
#define IMX6QDL_CLK_ASRC_MEM 211
#define IMX6QDL_CLK_END 212

#endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */

0 comments on commit aec247d

Please sign in to comment.