diff options
| author | Nadav Haklai <nadavh@marvell.com> | 2015-03-17 15:53:34 +0300 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2015-03-19 13:04:15 +0300 |
| commit | b7f01842bcbbf8aaf26c9f9bd413774114fa83c9 (patch) | |
| tree | 326cfab0267d9212219323d069178e63c093fa3f /arch/arm/boot/dts/armada-xp.dtsi | |
| parent | 7776ab70d75ff9857343e44e428744d81c30ce1b (diff) | |
| download | linux-b7f01842bcbbf8aaf26c9f9bd413774114fa83c9.tar.xz | |
ARM: mvebu: clk: remove cpuclk resources overlapping coredivclk registers on Armada XP
The resources of the cpuclk node are overlapping the one from
coredivclk node. It was not noticed until now because the driver did a
simple of_iomap and not a request_mem_region. This patch fixes it.
[gregory.clement@free-electrons.com: add commit log and port to 4.0-rc]
Signed-off-by: Nadav Haklai <nadavh@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index ff47345e19ed..448af3352175 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -150,7 +150,7 @@ cpuclk: clock-complex@18700 { #clock-cells = <1>; compatible = "marvell,armada-xp-cpu-clock"; - reg = <0x18700 0xA0>, <0x1c054 0x10>; + reg = <0x18700 0x24>, <0x1c054 0x10>; clocks = <&coreclk 1>; }; |