From b7f01842bcbbf8aaf26c9f9bd413774114fa83c9 Mon Sep 17 00:00:00 2001 From: Nadav Haklai Date: Tue, 17 Mar 2015 13:53:34 +0100 Subject: 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 Signed-off-by: Gregory CLEMENT Reviewed-by: Thomas Petazzoni --- arch/arm/boot/dts/armada-xp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/armada-xp.dtsi') 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>; }; -- cgit