diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-07-03 22:55:42 +0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-07-03 22:55:42 +0400 |
| commit | cdae1730d0c6b644b6df3a97618be89fde5e074d (patch) | |
| tree | 4f1012d672dab49029e1fbef1694087b4d3deb0f /drivers/clk/ti/dpll.c | |
| parent | fb2b3c9f68574738c70b9df5fc2bea40f91dd8be (diff) | |
| parent | c556bcddc78096caeb46dbe3ad0314dd951f1665 (diff) | |
| download | linux-cdae1730d0c6b644b6df3a97618be89fde5e074d.tar.xz | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/ti/dpll.c')
| -rw-r--r-- | drivers/clk/ti/dpll.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c index abd956d5f838..79791e1bf282 100644 --- a/drivers/clk/ti/dpll.c +++ b/drivers/clk/ti/dpll.c @@ -161,7 +161,8 @@ cleanup: } #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM33XX) + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM33XX) || \ + defined(CONFIG_SOC_AM43XX) /** * ti_clk_register_dpll_x2 - Registers a DPLLx2 clock * @node: device node for this clock @@ -322,7 +323,7 @@ CLK_OF_DECLARE(ti_omap4_dpll_x2_clock, "ti,omap4-dpll-x2-clock", of_ti_omap4_dpll_x2_setup); #endif -#ifdef CONFIG_SOC_AM33XX +#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX) static void __init of_ti_am3_dpll_x2_setup(struct device_node *node) { ti_clk_register_dpll_x2(node, &dpll_x2_ck_ops, NULL); |