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

Commit 473326a8 authored Sep 19, 2016 by Arnd Bergmann

Merge tag 'mvebu-dt64-4.9-2' of git://git.infradead.org/linux-mvebu into next/dt64

Pull "mvebu dt64 for 4.9 (part 2)" from Gregory CLEMENT:

- enable MSI for PCIe on Armada 7K/8K

* tag 'mvebu-dt64-4.9-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: enable MSI for PCIe on Armada 7K/8K

parents 37179033 93970e67

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =
		@@ -201,6 +202,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =
		@@ -227,6 +229,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =
		@@ -201,6 +202,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =
		@@ -227,6 +229,7 @@
		#interrupt-cells = <1>;
		device_type = "pci";
		dma-coherent;
		msi-parent = <&gic_v2m0>;

		bus-range = <0 0xff>;
		ranges =