Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5b84c45 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-fixes-3.14' of git://git.infradead.org/linux-mvebu into fixes 

mvebu dt fixes for v3.14

 - mvebu: add missing 'eth3' alias for mv78260

 - dove: revert PMU interrupt controller node, wait for driver to land.

* tag 'mvebu-dt-fixes-3.14' of git://git.infradead.org/linux-mvebu

:
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 28a9f3b0 ae10f832

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

		eth3 = &eth3;

	};



	cpus {
@@ -291,7 +292,7 @@ 
				interrupts = <91>;

			};



			ethernet@34000 {

			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x34000 0x4000>;

				interrupts = <14>;

arch/arm/boot/dts/dove.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -379,15 +379,6 @@ 
				#clock-cells = <1>;

			};



			pmu_intc: pmu-interrupt-ctrl@d0050 {

				compatible = "marvell,dove-pmu-intc";

				interrupt-controller;

				#interrupt-cells = <1>;

				reg = <0xd0050 0x8>;

				interrupts = <33>;

				marvell,#interrupts = <7>;

			};



			pinctrl: pin-ctrl@d0200 {

				compatible = "marvell,dove-pinctrl";

				reg = <0xd0200 0x10>;
@@ -610,8 +601,6 @@ 
			rtc: real-time-clock@d8500 {

				compatible = "marvell,orion-rtc";

				reg = <0xd8500 0x20>;

				interrupt-parent = <&pmu_intc>;

				interrupts = <5>;

			};



			gpio2: gpio-ctrl@e8400 {