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

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

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

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

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

- add support for Performance Monitor Unit on most of mvebu SoCs
- add nas2big support
- add support for USB3 port On Armada 385 AP

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

:
  ARM: mvebu: armada-385-ap: Enable USB3 port
  ARM: mvebu: Enable Performance Monitor Unit on Armada 380/385 SoC
  ARM: mvebu: Enable Performance Monitor Unit on Armada 375 SoC
  ARM: mvebu: Enable Performance Monitor Unit on Armada XP/370 SoCs
  ARM: Kirkwood: add DT description for nas2big

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 263c3f50 7776ab70

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ board. Currently known boards are: 
"lacie,cloudbox"

"lacie,inetspace_v2"

"lacie,laplug"

"lacie,nas2big"

"lacie,netspace_lite_v2"

"lacie,netspace_max_v2"

"lacie,netspace_mini_v2"

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-mv88f6281gtw-ge.dtb \

	kirkwood-nas2big.dtb \

	kirkwood-net2big.dtb \

	kirkwood-net5big.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

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

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ 
		};

	};



	pmu {

		compatible = "arm,cortex-a9-pmu";

		interrupts-extended = <&mpic 3>;

	};



	soc {

		#address-cells = <2>;

		#size-cells = <1>;

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

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ 
		};

	};



	pmu {

		compatible = "arm,cortex-a9-pmu";

		interrupts-extended = <&mpic 3>;

	};



	soc {

		compatible = "marvell,armada375-mbus", "simple-bus";

		#address-cells = <2>;

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

+28 −0
Original line number Diff line number Diff line
@@ -125,6 +125,13 @@ 
				status = "okay";

			};



			pinctrl@18000 {

				xhci0_vbus_pins: xhci0-vbus-pins {

					marvell,pins = "mpp44";

					marvell,function = "gpio";

				};

			};



			ethernet@30000 {

				status = "okay";

				phy = <&phy2>;
@@ -162,6 +169,11 @@ 
				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

			};



			usb3@f0000 {

				status = "okay";

				usb-phy = <&usb3_phy>;

			};

		};



		pcie-controller {
@@ -187,4 +199,20 @@ 
			};

		};

	};



	usb3_phy: usb3_phy {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&reg_xhci0_vbus>;

	};



	reg_xhci0_vbus: xhci0-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&xhci0_vbus_pins>;

		regulator-name = "xhci0-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

		gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;

	};

};