diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-21 05:33:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-21 05:33:37 -0800 |
| commit | dcf939a8a2430752ddde3a32154ac281bbccb03f (patch) | |
| tree | 1da597570c0d8d8b829e696283af836c0bcb0650 /drivers/clk/qcom | |
| parent | f388e2608cde02a2576e1aec661c03befe011ae6 (diff) | |
| parent | 8af0bacd05fb05dcb113f4d92c584e96355ec24b (diff) | |
Merge "clk: qcom: Move gcc_usb3_phy_pipe_clk to branch clock"
Diffstat (limited to 'drivers/clk/qcom')
| -rw-r--r-- | drivers/clk/qcom/gcc-sdm660.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/qcom/gcc-sdm660.c b/drivers/clk/qcom/gcc-sdm660.c index 3413859a56ef..e17a551017e3 100644 --- a/drivers/clk/qcom/gcc-sdm660.c +++ b/drivers/clk/qcom/gcc-sdm660.c @@ -2493,14 +2493,15 @@ static struct clk_branch gcc_usb3_phy_aux_clk = { }, }; -static struct clk_gate2 gcc_usb3_phy_pipe_clk = { - .udelay = 50, +static struct clk_branch gcc_usb3_phy_pipe_clk = { + .halt_reg = 0x50004, + .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x50004, .enable_mask = BIT(0), .hw.init = &(struct clk_init_data){ .name = "gcc_usb3_phy_pipe_clk", - .ops = &clk_gate2_ops, + .ops = &clk_branch2_ops, }, }, }; |