Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next

diff --cc drivers/clk/ti/fapll.c
index d21640634adf91e290537e28eb799aeea1042eed,e8291c3a0e76e5c36606133b72f2a47aabd5eb9d..ffcd8e09e85b9eae1a1ffea5dda006b976a93fc5
--- 1/drivers/clk/ti/fapll.c
--- 2/drivers/clk/ti/fapll.c
+++ b/drivers/clk/ti/fapll.c
@@@ -84,8 -138,9 +138,9 @@@ static int ti_fapll_enable(struct clk_h
        struct fapll_data *fd = to_fapll(hw);
        u32 v = readl_relaxed(fd->base);
  
 -      v |= (1 << FAPLL_MAIN_PLLEN);
 +      v |= FAPLL_MAIN_PLLEN;
        writel_relaxed(v, fd->base);
+       ti_fapll_wait_lock(fd);
  
        return 0;
  }