diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-19 01:18:52 -0500 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-19 01:18:52 -0500 |
| commit | 7364001478597759fc5e00536bbe926ec9c25db0 (patch) | |
| tree | d77eea329b52b89a241f75dcdf3a71effef74cd9 /arch/arm | |
| parent | 37a4493ee73b93c4d25e57d5ac975e4cb48165f5 (diff) | |
| parent | 565bbdcd3b91523b4142587c00206302e091a23e (diff) | |
Merge branch 'for_3.14-rcx/clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-fixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/keystone-clocks.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/keystone-clocks.dtsi b/arch/arm/boot/dts/keystone-clocks.dtsi index 2363593e1050..ef58d1c24313 100644 --- a/arch/arm/boot/dts/keystone-clocks.dtsi +++ b/arch/arm/boot/dts/keystone-clocks.dtsi | |||
| @@ -612,7 +612,7 @@ clocks { | |||
| 612 | compatible = "ti,keystone,psc-clock"; | 612 | compatible = "ti,keystone,psc-clock"; |
| 613 | clocks = <&chipclk13>; | 613 | clocks = <&chipclk13>; |
| 614 | clock-output-names = "vcp-3"; | 614 | clock-output-names = "vcp-3"; |
| 615 | reg = <0x0235000a8 0xb00>, <0x02350060 0x400>; | 615 | reg = <0x023500a8 0xb00>, <0x02350060 0x400>; |
| 616 | reg-names = "control", "domain"; | 616 | reg-names = "control", "domain"; |
| 617 | domain-id = <24>; | 617 | domain-id = <24>; |
| 618 | }; | 618 | }; |