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

Commit 704ef0bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "mvebu DT changes for v3.16 (incremental #2)" from Jason Cooper:

 - kirkwood
    - add OpenRD boards
    - make keymile boards bootable with latest kernels

 - mvebu
    - add ehci/xhci to Armada 375/38x boards

* tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: kirkwood: add kirkwood-km_fixedeth DTS file
  ARM: dts: kirkwood: add kirkwood-km_common DTSI files
  ARM: dts: kirkwood: resynch 98dx4122 dtsi
  ARM: mvebu: add Device Tree description for the EHCI controllers on Armada 375
  ARM: mvebu: add Device Tree description of the xHCI controller on Armada 375
  ARM: mvebu: add Device Tree description of the EHCI controller on Armada 38x
  ARM: mvebu: add Device Tree description of xHCI controllers on Armada 38x
  ARM: Kirkwood: DT versions of OpenRD boards

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cce9e45c 599a136e

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ kirkwood := \ 
	kirkwood-nsa310a.dtb \

	kirkwood-openblocks_a6.dtb \

	kirkwood-openblocks_a7.dtb \

	kirkwood-openrd-base.dtb \

	kirkwood-openrd-client.dtb \

	kirkwood-openrd-ultimate.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-a0.dtb \

	kirkwood-rd88f6281-a1.dtb \

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

+8 −0
Original line number Diff line number Diff line
@@ -101,6 +101,14 @@ 
				};

			};



			usb@54000 {

				status = "okay";

			};



			usb3@58000 {

				status = "okay";

			};



			mvsdio@d4000 {

				pinctrl-0 = <&sdio_pins &sdio_st_pins>;

				pinctrl-names = "default";

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

+24 −0
Original line number Diff line number Diff line
@@ -345,6 +345,30 @@ 
				reg = <0x21010 0x1c>;

			};



			usb@50000 {

				compatible = "marvell,orion-ehci";

				reg = <0x50000 0x500>;

				interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 18>;

				status = "disabled";

			};



			usb@54000 {

				compatible = "marvell,orion-ehci";

				reg = <0x54000 0x500>;

				interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 26>;

				status = "disabled";

			};



			usb3@58000 {

				compatible = "marvell,armada-375-xhci";

				reg = <0x58000 0x20000>,<0x5b880 0x80>;

				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 16>;

				status = "disabled";

			};



			xor@60800 {

				compatible = "marvell,orion-xor";

				reg = <0x60800 0x100

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

+12 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
				phy-mode = "rgmii-id";

			};



			usb@50000 {

				status = "ok";

			};



			ethernet@70000 {

				status = "okay";

				phy = <&phy0>;
@@ -116,6 +120,14 @@ 
				bus-width = <8>;

				status = "okay";

			};



			usb3@f0000 {

				status = "okay";

			};



			usb3@f8000 {

				status = "okay";

			};

		};



		pcie-controller {

arch/arm/boot/dts/armada-385-rd.dts

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ 
					reg = <1>;

				};

			};



			usb3@f0000 {

				status = "okay";

			};

		};



		pcie-controller {