From: Michael Turquette <mturquette@linaro.org>
Date: Tue, 24 Mar 2015 23:33:33 +0000 (-0700)
Subject: Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next
X-Git-Tag: v4.1-rc1~63^2~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c77662a4df847e7b75ff8c5f2314dd4f022377e3;p=karo-tx-linux.git

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

c77662a4df847e7b75ff8c5f2314dd4f022377e3
diff --cc drivers/clk/ti/fapll.c
index d21640634adf,e8291c3a0e76..ffcd8e09e85b
--- a/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;
  }