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
1 changed files with 1 additions and 0 deletions

View File

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