diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-02-13 11:14:58 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-19 09:31:48 +0200 |
| commit | c368dbe2de0a7fec2488eb7e4dcccfe25714ed2b (patch) | |
| tree | 413544b96925040497ea365ac49d694423538928 /arch | |
| parent | 64a900ff4727c93e076e814c917f68c225c9b630 (diff) | |
| download | linux-stable-c368dbe2de0a7fec2488eb7e4dcccfe25714ed2b.tar.gz linux-stable-c368dbe2de0a7fec2488eb7e4dcccfe25714ed2b.tar.bz2 linux-stable-c368dbe2de0a7fec2488eb7e4dcccfe25714ed2b.zip | |
ARM: dts: use ti,fixed-factor-clock for dpll4_m4x2_mul_ck
We need to use set-rate-parent for dpll4_m4 clock path, so use the
ti,fixed-factor-clock version which supports set-rate-parent property.
The set-rate-parent flag itself is set in the following patch, this one
just changes the clock driver to ti,fixed-factor-clock without any other
changes.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
Tested-by: Marek Belisko <marek@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/omap36xx-clocks.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3xxx-clocks.dtsi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap36xx-clocks.dtsi b/arch/arm/boot/dts/omap36xx-clocks.dtsi index 0b2df76b9d38..6b5280d04a0e 100644 --- a/arch/arm/boot/dts/omap36xx-clocks.dtsi +++ b/arch/arm/boot/dts/omap36xx-clocks.dtsi @@ -79,7 +79,7 @@ }; &dpll4_m4x2_mul_ck { - clock-mult = <1>; + ti,clock-mult = <1>; }; &dpll4_m5x2_mul_ck { diff --git a/arch/arm/boot/dts/omap3xxx-clocks.dtsi b/arch/arm/boot/dts/omap3xxx-clocks.dtsi index cb04d4b37e7f..df3c699a1893 100644 --- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi +++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi @@ -425,10 +425,10 @@ dpll4_m4x2_mul_ck: dpll4_m4x2_mul_ck { #clock-cells = <0>; - compatible = "fixed-factor-clock"; + compatible = "ti,fixed-factor-clock"; clocks = <&dpll4_m4_ck>; - clock-mult = <2>; - clock-div = <1>; + ti,clock-mult = <2>; + ti,clock-div = <1>; }; dpll4_m4x2_ck: dpll4_m4x2_ck { |