diff options
| author | Bai Ping <ping.bai@nxp.com> | 2017-01-20 17:40:02 +0800 |
|---|---|---|
| committer | Robby Cai <robby.cai@nxp.com> | 2017-04-19 19:13:45 +0800 |
| commit | 03d8ca23239d9662e3244e7c07d28825ad3d66c3 (patch) | |
| tree | f016990a77491686c2389122545167cdbe5ef6e1 /arch/arm | |
| parent | 6e94ed319dbd2459462225dfd7710b37d4f8a8e8 (diff) | |
MLK-13801-01 ARM: imx: add gpt_3m clock on imx6sll
Add gpt_3m clock source on i.MX6SLL.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit a0c56a60ea0c0acae0bc8eea75c465eeb11826cd)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6sll.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6ul.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clk-imx6sll.c b/arch/arm/mach-imx/clk-imx6sll.c index c3c6d7512413..4908ea3065c2 100644 --- a/arch/arm/mach-imx/clk-imx6sll.c +++ b/arch/arm/mach-imx/clk-imx6sll.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -190,6 +191,7 @@ static void __init imx6sll_clocks_init(struct device_node *ccm_node) clks[IMX6SLL_CLK_PLL3_120M] = imx_clk_fixed_factor("pll3_120m", "pll3_usb_otg", 1, 4); clks[IMX6SLL_CLK_PLL3_80M] = imx_clk_fixed_factor("pll3_80m", "pll3_usb_otg", 1, 6); clks[IMX6SLL_CLK_PLL3_60M] = imx_clk_fixed_factor("pll3_60m", "pll3_usb_otg", 1, 8); + clks[IMX6SLL_CLK_GPT_3M] = imx_clk_fixed_factor("gpt_3m", "osc", 1, 8); np = ccm_node; base = of_iomap(np, 0); diff --git a/arch/arm/mach-imx/clk-imx6ul.c b/arch/arm/mach-imx/clk-imx6ul.c index 680d98ddf981..2c01f843c3d9 100644 --- a/arch/arm/mach-imx/clk-imx6ul.c +++ b/arch/arm/mach-imx/clk-imx6ul.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License |