diff options
| author | Stephen Boyd | 2019-05-07 20:46:02 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2019-05-07 20:46:02 +0200 |
| commit | 0caf000817353cfc5db22363ecdac63b83d3a3f9 (patch) | |
| tree | 0921f1ab48c2b28498def22c13b9228f39a93b79 /include/linux/clk | |
| parent | Merge branches 'clk-stm32f4', 'clk-tegra', 'clk-at91', 'clk-sifive-fu540' and... (diff) | |
| parent | clk: Remove CLK_IS_BASIC clk flag (diff) | |
| download | kernel-qcow2-linux-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.gz kernel-qcow2-linux-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.xz kernel-qcow2-linux-0caf000817353cfc5db22363ecdac63b83d3a3f9.zip | |
Merge branch 'clk-ti' into clk-next
* clk-ti:
clk: Remove CLK_IS_BASIC clk flag
clk: ti: dra7: disable the RNG and TIMER12 clkctrl clocks on HS devices
clk: ti: dra7x: prevent non-existing clkctrl clocks from registering
ARM: omap2+: hwmod: drop CLK_IS_BASIC flag usage
clk: ti: export the omap2_clk_is_hw_omap call
Diffstat (limited to 'include/linux/clk')
| -rw-r--r-- | include/linux/clk/ti.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index 78872efc7be0..1e8ef96555ce 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -243,6 +243,7 @@ struct ti_clk_ll_ops { #define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw) +bool omap2_clk_is_hw_omap(struct clk_hw *hw); int omap2_clk_disable_autoidle_all(void); int omap2_clk_enable_autoidle_all(void); int omap2_clk_allow_idle(struct clk *clk); @@ -293,6 +294,7 @@ struct ti_clk_features { #define TI_CLK_DISABLE_CLKDM_CONTROL BIT(2) #define TI_CLK_ERRATA_I810 BIT(3) #define TI_CLK_CLKCTRL_COMPAT BIT(4) +#define TI_CLK_DEVICE_TYPE_GP BIT(5) void ti_clk_setup_features(struct ti_clk_features *features); const struct ti_clk_features *ti_clk_get_features(void); |