diff options
| author | Tero Kristo <t-kristo@ti.com> | 2018-08-13 14:30:49 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2018-10-03 15:02:27 +0300 |
| commit | dffa9051d54672a7d7f5951e074c4393672c03e9 (patch) | |
| tree | f3b0434d0bbfcce3632cb84958b6678f7bcbe969 /drivers/clk/ti/clkctrl.c | |
| parent | 43c56e046cd8229315a466b079c53f4ab0f8dcf2 (diff) | |
clk: ti: dra7: add new clkctrl data
The new clkctrl data layout for dra7xx is split based on clockdomain
boundaries. Previously the split was based on CM boundaries. This patch
adds the new data as separate data entity, retaining the compatibility
data also for now. The compatibility data can be removed once no longer
needed.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/clk/ti/clkctrl.c')
| -rw-r--r-- | drivers/clk/ti/clkctrl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index c1fbb3d20155..955f2e26ab00 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -463,8 +463,12 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) data = omap5_clkctrl_data; #endif #ifdef CONFIG_SOC_DRA7XX - if (of_machine_is_compatible("ti,dra7")) - data = dra7_clkctrl_compat_data; + if (of_machine_is_compatible("ti,dra7")) { + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) + data = dra7_clkctrl_compat_data; + else + data = dra7_clkctrl_data; + } #endif #ifdef CONFIG_SOC_AM33XX if (of_machine_is_compatible("ti,am33xx")) { |