diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-05-07 11:46:02 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-05-07 11:46:02 -0700 |
commit | 0caf000817353cfc5db22363ecdac63b83d3a3f9 (patch) | |
tree | 0921f1ab48c2b28498def22c13b9228f39a93b79 /drivers/clk/ti/clock.h | |
parent | ff060019f4e536b7456fb5d4ac7891b102cb4a44 (diff) | |
parent | 90b6c5c73c6904ac200161fc38974d867f0535b0 (diff) | |
download | linux-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.bz2 |
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 'drivers/clk/ti/clock.h')
-rw-r--r-- | drivers/clk/ti/clock.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h index 1c0fac59d809..e4b8392ff63c 100644 --- a/drivers/clk/ti/clock.h +++ b/drivers/clk/ti/clock.h @@ -83,6 +83,13 @@ enum { #define CLKF_HW_SUP BIT(6) #define CLKF_NO_IDLEST BIT(7) +#define CLKF_SOC_MASK GENMASK(11, 8) + +#define CLKF_SOC_NONSEC BIT(8) +#define CLKF_SOC_DRA72 BIT(9) +#define CLKF_SOC_DRA74 BIT(10) +#define CLKF_SOC_DRA76 BIT(11) + #define CLK(dev, con, ck) \ { \ .lk = { \ @@ -303,7 +310,6 @@ long omap4_dpll_regm4xen_round_rate(struct clk_hw *hw, int omap4_dpll_regm4xen_determine_rate(struct clk_hw *hw, struct clk_rate_request *req); int omap2_clk_for_each(int (*fn)(struct clk_hw_omap *hw)); -bool omap2_clk_is_hw_omap(struct clk_hw *hw); extern struct ti_clk_ll_ops *ti_clk_ll_ops; |