diff options
| author |  Tero Kristo <t-kristo@ti.com>
| 2018-08-13 10:48:52 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com>
| 2018-10-03 15:02:27 +0300 |
| commit | 76a1049b84dd57bad6260b51455bbd17053b2eb4 (patch) | |
| tree | 083bc8aff7568b7f9f6787e74487bede1691029f /drivers/clk/ti/clkctrl.c | |
| parent | clk: ti: am43xx: rename existing clkctrl data as compat data (diff) | |
| download | linux-76a1049b84dd57bad6260b51455bbd17053b2eb4.tar.gz linux-76a1049b84dd57bad6260b51455bbd17053b2eb4.tar.bz2 linux-76a1049b84dd57bad6260b51455bbd17053b2eb4.zip | |
clk: ti: am43xx: add new clkctrl data for am43xx
The new clkctrl data layout for am43xx 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 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 57f352ac9371..6fe10a9f3116 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -475,10 +475,19 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) } #endif #ifdef CONFIG_SOC_AM43XX - if (of_machine_is_compatible("ti,am4372")) - data = am4_clkctrl_compat_data; - if (of_machine_is_compatible("ti,am438x")) - data = am438x_clkctrl_compat_data; + if (of_machine_is_compatible("ti,am4372")) { + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) + data = am4_clkctrl_compat_data; + else + data = am4_clkctrl_data; + } + + if (of_machine_is_compatible("ti,am438x")) { + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) + data = am438x_clkctrl_compat_data; + else + data = am438x_clkctrl_data; + } #endif #ifdef CONFIG_SOC_TI81XX if (of_machine_is_compatible("ti,dm814")) |