aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-02-18 22:18:52 -0800
committerMike Turquette <mturquette@linaro.org>2014-02-18 22:18:52 -0800
commit7364001478597759fc5e00536bbe926ec9c25db0 (patch)
treed77eea329b52b89a241f75dcdf3a71effef74cd9 /arch/arm/boot
parent37a4493ee73b93c4d25e57d5ac975e4cb48165f5 (diff)
parent565bbdcd3b91523b4142587c00206302e091a23e (diff)
downloadlinux-7364001478597759fc5e00536bbe926ec9c25db0.tar.gz
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/boot')
-rw-r--r--arch/arm/boot/dts/keystone-clocks.dtsi2
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 {
compatible = "ti,keystone,psc-clock";
clocks = <&chipclk13>;
clock-output-names = "vcp-3";
- reg = <0x0235000a8 0xb00>, <0x02350060 0x400>;
+ reg = <0x023500a8 0xb00>, <0x02350060 0x400>;
reg-names = "control", "domain";
domain-id = <24>;
};