diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
| commit | 0066f3b93e144762b409940fa37bb1cd36c1baf7 (patch) | |
| tree | 0c99b2754fb16c2a787bc1d086bd6fb268b12b1a /arch/arm/boot/dts/keystone-clocks.dtsi | |
| parent | e65312fe868da53077780de618e213a53dc90d00 (diff) | |
| parent | b8ad0f912b93c23c34dfedc615a0eeba6ca29463 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/keystone-clocks.dtsi')
| -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 { 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>; }; |