Merge branch 'for-v3.17-rc/ti-clk-dt' of github.com:t-kristo/linux-pm into fixes-rc3

This commit is contained in:
Tony Lindgren 2014-09-03 14:39:51 -07:00
commit 5c01d5d134

View file

@ -467,6 +467,7 @@ dpll4_m5x2_ck: dpll4_m5x2_ck {
ti,bit-shift = <0x1e>;
reg = <0x0d00>;
ti,set-bit-to-disable;
ti,set-rate-parent;
};
dpll4_m6_ck: dpll4_m6_ck {