Commit 4b3be93d authored Apr 03, 2015 by Olof Johansson

Merge tag 'mvebu-dt-4.1-3' of git://git.infradead.org/linux-mvebu into next/dt

Merge "ARM: mvebu: dt changes for v4.1 (round 3)" from Gregory Clement:

mvebu dt changes for v4.1 (part #3)

These changes have no influence on the kernel behavior (except
removing a warning message), but they allow to have a better
representation of the hardware.

- conform L2CC node with ePAPR specification by adding cache-level
- remove cpuclk resources overlapping coredivclk registers on Armada XP

* tag 'mvebu-dt-4.1-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: Conform L2CC node with ePAPR specification by adding cache-level
  ARM: mvebu: clk: remove cpuclk resources overlapping coredivclk registers on Armada XP

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ccca5d7d 292a3546

arch/arm/boot/dts/armada-370.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@
		compatible = "marvell,aurora-outer-cache";
		reg = <0x08000 0x1000>;
		cache-id-part = <0x100>;
		cache-level = <2>;
		cache-unified;
		wt-override;
		};

arch/arm/boot/dts/armada-xp.dtsi

+2 −1

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@
		compatible = "marvell,aurora-system-cache";
		reg = <0x08000 0x1000>;
		cache-id-part = <0x100>;
		cache-level = <2>;
		cache-unified;
		wt-override;
		};
		@@ -150,7 +151,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>;
		};