diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 11:58:26 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 11:58:26 -0700 |
| commit | 4d341056202a4725777ed99897f6456405819cd4 (patch) | |
| tree | 45fb9d229bacf995aabcad282937568e5201b5a7 /drivers/clk/ti/clk-7xx.c | |
| parent | e306479ac252928b84cc563c6e790f9b7e7ae427 (diff) | |
| parent | 989feafb84118a840ff21250a1e5f516f43e3dbb (diff) | |
| download | lwn-4d341056202a4725777ed99897f6456405819cd4.tar.gz lwn-4d341056202a4725777ed99897f6456405819cd4.zip | |
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next
From Tero Kristo:
"This pull request contains the TI clock driver set to move the
clock implementations under clock driver. Some small portions of
the clock driver code still remain under mach-omap2 after this,
it should be decided whether this code is now obsolete and should
be deleted or should someone try to fix it."
Slight merge conflicts with determine_rate prototype changes.
Diffstat (limited to 'drivers/clk/ti/clk-7xx.c')
| -rw-r--r-- | drivers/clk/ti/clk-7xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c index 63b8323df918..9b5b289e6334 100644 --- a/drivers/clk/ti/clk-7xx.c +++ b/drivers/clk/ti/clk-7xx.c @@ -16,11 +16,12 @@ #include <linux/clkdev.h> #include <linux/clk/ti.h> +#include "clock.h" + #define DRA7_DPLL_ABE_DEFFREQ 180633600 #define DRA7_DPLL_GMAC_DEFFREQ 1000000000 #define DRA7_DPLL_USB_DEFFREQ 960000000 - static struct ti_dt_clk dra7xx_clks[] = { DT_CLK(NULL, "atl_clkin0_ck", "atl_clkin0_ck"), DT_CLK(NULL, "atl_clkin1_ck", "atl_clkin1_ck"), |