diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-06-10 16:53:25 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-06-10 16:53:25 -0700 |
| commit | 3f6eec9969d24f91a3909d51e86e007ca5efd4c4 (patch) | |
| tree | bff0f51bab78b18d52cfd57ad7cd8b78ac6a882c /arch/arm/boot/dts/omap54xx-clocks.dtsi | |
| parent | 963649d735c8b6eb0f97e82c54f02426ff3f1f45 (diff) | |
| parent | 7e148070001ae82df08966199580a29b934e3bf3 (diff) | |
Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'arch/arm/boot/dts/omap54xx-clocks.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap54xx-clocks.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap54xx-clocks.dtsi b/arch/arm/boot/dts/omap54xx-clocks.dtsi index aeb142ce8e9d..e67a23b5d788 100644 --- a/arch/arm/boot/dts/omap54xx-clocks.dtsi +++ b/arch/arm/boot/dts/omap54xx-clocks.dtsi @@ -335,7 +335,7 @@ dpll_mpu_ck: dpll_mpu_ck { #clock-cells = <0>; - compatible = "ti,omap4-dpll-clock"; + compatible = "ti,omap5-mpu-dpll-clock"; clocks = <&sys_clkin>, <&mpu_dpll_hs_clk_div>; reg = <0x0160>, <0x0164>, <0x016c>, <0x0168>; }; |