]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: mvebu: clk: remove cpuclk resources overlapping coredivclk registers on Armada XP
authorNadav Haklai <nadavh@marvell.com>
Tue, 17 Mar 2015 12:53:34 +0000 (13:53 +0100)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Thu, 19 Mar 2015 10:04:15 +0000 (11:04 +0100)
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>
arch/arm/boot/dts/armada-xp.dtsi

index ff47345e19eded2f1a85efa70a5dbd1fcac45d1b..448af3352175db1e8d91d49f3242f40880faed90 100644 (file)
                        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>;
                        };