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

Commit cf828ecc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "mvebu dt for 4.14 (part 1)" from Gregory CLEMENT:

Add arm_global_timer node on Armada 38x

Fix PCI bus dtc warnings on mvebu 32 bits device tree files

* tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-38x: Add arm_global_timer node
  ARM: dts: marvell: fix PCI bus dtc warnings
parents 92a2a8cb 0f015017

Documentation/devicetree/bindings/pci/mvebu-pci.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ pcie-controller { 
		status = "disabled";

		status = "disabled";

	};

	};





	pcie@10,0 {

	pcie@a,0 {

		device_type = "pci";

		device_type = "pci";

		assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;

		assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;

		reg = <0x5000 0 0 0 0>;

		reg = <0x5000 0 0 0 0>;

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ 
			reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;

			reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;

		};

		};





		pciec: pcie-controller@82000000 {

		pciec: pcie@82000000 {

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

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

			status = "disabled";

			status = "disabled";

			device_type = "pci";

			device_type = "pci";
@@ -100,6 +100,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;

                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &mpic 58>;

				interrupt-map = <0 0 0 0 &mpic 58>;

				marvell,pcie-port = <0>;

				marvell,pcie-port = <0>;
@@ -117,6 +118,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;

                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &mpic 62>;

				interrupt-map = <0 0 0 0 &mpic 62>;

				marvell,pcie-port = <1>;

				marvell,pcie-port = <1>;

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -582,7 +582,7 @@ 
			};

			};

		};

		};





		pciec: pcie-controller@82000000 {

		pciec: pcie@82000000 {

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

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

			status = "disabled";

			status = "disabled";

			device_type = "pci";

			device_type = "pci";
@@ -610,6 +610,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <0>;

				marvell,pcie-port = <0>;
@@ -627,6 +628,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <0>;

				marvell,pcie-port = <0>;

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ 
			};

			};

		};

		};





		pcie-controller {

		pcie {

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

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

			status = "disabled";

			status = "disabled";

			device_type = "pci";

			device_type = "pci";
@@ -104,6 +104,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <0>;

				marvell,pcie-port = <0>;
@@ -122,6 +123,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <1>;

				marvell,pcie-port = <1>;
@@ -140,6 +142,7 @@ 
				#interrupt-cells = <1>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0

				ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0

					  0x81000000 0 0 0x81000000 0x3 0 1 0>;

					  0x81000000 0 0 0x81000000 0x3 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <2>;

				marvell,pcie-port = <2>;

arch/arm/boot/dts/armada-385-db-ap.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ 
			status = "okay";

			status = "okay";

		};

		};





		pcie-controller {

		pcie {

			status = "okay";

			status = "okay";





			/*

			/*