diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-10-19 01:41:21 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-10-19 01:41:21 +0300 |
| commit | 8a69f1d4707a69faab58d9735c2cb1898140124a (patch) | |
| tree | 1f4e1f45a596a63baec951c42b9e62914f585737 /drivers/clk/ti/gate.c | |
| parent | cc2adbe370f190fb13531ba1f55a9b0d9dc8828a (diff) | |
| parent | a72d785021cb92cc0abd4bb3d75607c82150fade (diff) | |
| download | linux-8a69f1d4707a69faab58d9735c2cb1898140124a.tar.xz | |
Merge branch 'clk-ti' into clk-next
* clk-ti:
clk: ti: Prepare for remove of OF node name
clk: Clean up suspend/resume coding style
clk: ti: Add functions to save/restore clk context
clk: clk: Add clk_gate_restore_context function
clk: Add functions to save/restore clock context en-masse
clk: ti: dra7: add new clkctrl data
clk: ti: dra7xx: rename existing clkctrl data as compat data
clk: ti: am43xx: add new clkctrl data for am43xx
clk: ti: am43xx: rename existing clkctrl data as compat data
clk: ti: am33xx: add new clkctrl data for am33xx
clk: ti: am33xx: rename existing clkctrl data as compat data
clk: ti: clkctrl: replace dashes from clkdm name with underscore
clk: ti: clkctrl: support multiple clkctrl nodes under a cm node
dt-bindings: clock: dra7xx: add clkctrl indices for new data layout
dt-bindings: clock: am43xx: add clkctrl indices for new data layout
dt-bindings: clock: am33xx: add clkctrl indices for new data layout
Diffstat (limited to 'drivers/clk/ti/gate.c')
| -rw-r--r-- | drivers/clk/ti/gate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c index d4b5638e8b99..1c78fff5513c 100644 --- a/drivers/clk/ti/gate.c +++ b/drivers/clk/ti/gate.c @@ -33,6 +33,7 @@ static const struct clk_ops omap_gate_clkdm_clk_ops = { .init = &omap2_init_clk_clkdm, .enable = &omap2_clkops_enable_clkdm, .disable = &omap2_clkops_disable_clkdm, + .restore_context = clk_gate_restore_context, }; const struct clk_ops omap_gate_clk_ops = { @@ -40,6 +41,7 @@ const struct clk_ops omap_gate_clk_ops = { .enable = &omap2_dflt_clk_enable, .disable = &omap2_dflt_clk_disable, .is_enabled = &omap2_dflt_clk_is_enabled, + .restore_context = clk_gate_restore_context, }; static const struct clk_ops omap_gate_clk_hsdiv_restore_ops = { @@ -47,6 +49,7 @@ static const struct clk_ops omap_gate_clk_hsdiv_restore_ops = { .enable = &omap36xx_gate_clk_enable_with_hsdiv_restore, .disable = &omap2_dflt_clk_disable, .is_enabled = &omap2_dflt_clk_is_enabled, + .restore_context = clk_gate_restore_context, }; /** |