diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-03-15 00:44:55 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-03-15 00:44:55 +0300 |
| commit | 401fd20f1f61678d3f71778d32911a941cc70f04 (patch) | |
| tree | 55b95d08e4b51641297f5eb89e19a835df6dbd1b /include/linux | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| parent | 3c13933c60338ce6fb2369bd0e93f91e52ddc17d (diff) | |
| download | linux-401fd20f1f61678d3f71778d32911a941cc70f04.tar.xz | |
Merge tag 'ti-clk-for-4.17' of https://github.com/t-kristo/linux-pm into clk-ti
Pull TI SoC clock updates for 4.17 from Tero Kristo:
* tag 'ti-clk-for-4.17' of https://github.com/t-kristo/linux-pm:
clk: keystone: sci-clk: add support for dynamically probing clocks
clk: ti: add support for clock latching to mux clocks
clk: ti: add support for clock latching to divider clocks
clk: ti: add generic support for clock latching
clk: ti: add support for register read-modify-write low-level operation
dt-bindings: clock: ti: add latching support to mux and divider clocks
Diffstat (limited to 'include/linux')
| -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 d18da839b810..9e8611470187 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -211,6 +211,7 @@ enum { * struct ti_clk_ll_ops - low-level ops for clocks * @clk_readl: pointer to register read function * @clk_writel: pointer to register write function + * @clk_rmw: pointer to register read-modify-write function * @clkdm_clk_enable: pointer to clockdomain enable function * @clkdm_clk_disable: pointer to clockdomain disable function * @clkdm_lookup: pointer to clockdomain lookup function @@ -226,6 +227,7 @@ enum { struct ti_clk_ll_ops { u32 (*clk_readl)(const struct clk_omap_reg *reg); void (*clk_writel)(u32 val, const struct clk_omap_reg *reg); + void (*clk_rmw)(u32 val, u32 mask, const struct clk_omap_reg *reg); int (*clkdm_clk_enable)(struct clockdomain *clkdm, struct clk *clk); int (*clkdm_clk_disable)(struct clockdomain *clkdm, struct clk *clk); |
