From: Liu Ying Date: Fri, 16 Aug 2013 05:44:42 +0000 (+0800) Subject: ENGR00275483-1 ARM: imx6q: clk: add video 27m clock X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=650f32032534c5436d467684d22210077dce965f;p=karo-tx-linux.git ENGR00275483-1 ARM: imx6q: clk: add video 27m clock This patch adds the fixed factor video 27m clock in the imx6q clock driver. This clock's parent clock is the pll3_pfd1_540m clock. Conflicts: Documentation/devicetree/bindings/clock/imx6q-clock.txt arch/arm/mach-imx/clk-imx6q.c Signed-off-by: Liu Ying (cherry picked from commit 922c6a032581cfe0aff45d7495fd7816b55c2f39) --- diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index f6e7f47490db..560592cd5019 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Freescale Semiconductor, Inc. + * Copyright 2011-2014 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * * The code contained herein is licensed under the GNU General Public @@ -196,6 +196,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[IMX6QDL_CLK_PLL3_80M] = imx_clk_fixed_factor("pll3_80m", "pll3_usb_otg", 1, 6); clk[IMX6QDL_CLK_PLL3_60M] = imx_clk_fixed_factor("pll3_60m", "pll3_usb_otg", 1, 8); clk[IMX6QDL_CLK_TWD] = imx_clk_fixed_factor("twd", "arm", 1, 2); + clk[IMX6QDL_CLK_VIDEO_27M] = imx_clk_fixed_factor("video_27m", "pll3_pfd1_540m", 1, 20); clk[IMX6QDL_CLK_PLL4_POST_DIV] = clk_register_divider_table(NULL, "pll4_post_div", "pll4_audio", CLK_SET_RATE_PARENT, base + 0x70, 19, 2, 0, post_div_table, &imx_ccm_lock); clk[IMX6QDL_CLK_PLL4_AUDIO_DIV] = clk_register_divider(NULL, "pll4_audio_div", "pll4_post_div", CLK_SET_RATE_PARENT, base + 0x170, 15, 1, 0, &imx_ccm_lock); diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h index 4b7b392c003e..a0ff66a04a2b 100644 --- a/include/dt-bindings/clock/imx6qdl-clock.h +++ b/include/dt-bindings/clock/imx6qdl-clock.h @@ -1,5 +1,5 @@ /* - * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2014 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -221,6 +221,7 @@ #define IMX6QDL_CLK_LDB_DI1_DIV_7 210 #define IMX6QDL_CLK_LDB_DI0_DIV_SEL 211 #define IMX6QDL_CLK_LDB_DI1_DIV_SEL 212 -#define IMX6QDL_CLK_END 213 +#define IMX6QDL_CLK_VIDEO_27M 213 +#define IMX6QDL_CLK_END 214 #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */