diff options
| author | Stephen Boyd <[email protected]> | 2019-05-07 11:46:02 -0700 |
|---|---|---|
| committer | Stephen Boyd <[email protected]> | 2019-05-07 11:46:02 -0700 |
| commit | 0caf000817353cfc5db22363ecdac63b83d3a3f9 (patch) | |
| tree | 0921f1ab48c2b28498def22c13b9228f39a93b79 /drivers/pwm/pwm-meson.c | |
| parent | ff060019f4e536b7456fb5d4ac7891b102cb4a44 (diff) | |
| parent | 90b6c5c73c6904ac200161fc38974d867f0535b0 (diff) | |
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/pwm/pwm-meson.c')
| -rw-r--r-- | drivers/pwm/pwm-meson.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index c1ed641b3e26..4ae5d774443e 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -470,7 +470,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, init.name = name; init.ops = &clk_mux_ops; - init.flags = CLK_IS_BASIC; + init.flags = 0; init.parent_names = meson->data->parent_names; init.num_parents = meson->data->num_parents; |