Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / arch / arm64 / boot / dts / marvell / armada-7040-db.dts

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 92c761c380d33c37f5d6070729b02c23a6d93752..9c3bdf87e5433f2a800eae0a2a1e32c8c924dd88 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -44,6 +44,7 @@
  * Device Tree file for Marvell Armada 7040 Development board platform
  */
 
+#include <dt-bindings/gpio/gpio.h>
 #include "armada-7040.dtsi"
 
 / {
@@ -59,6 +60,34 @@
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x80000000>;
        };
+
+       cpm_reg_usb3_0_vbus: cpm-usb3-0-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb3h0-vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;
+       };
+
+       cpm_reg_usb3_1_vbus: cpm-usb3-1-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb3h1-vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
+       };
+
+       cpm_usb3_0_phy: cpm-usb3-0-phy {
+               compatible = "usb-nop-xceiv";
+               vcc-supply = <&cpm_reg_usb3_0_vbus>;
+       };
+
+       cpm_usb3_1_phy: cpm-usb3-1-phy {
+               compatible = "usb-nop-xceiv";
+               vcc-supply = <&cpm_reg_usb3_1_vbus>;
+       };
 };
 
 &i2c0 {
@@ -105,6 +134,14 @@
 &cpm_i2c0 {
        status = "okay";
        clock-frequency = <100000>;
+
+       expander0: pca9555@21 {
+               compatible = "nxp,pca9555";
+               pinctrl-names = "default";
+               gpio-controller;
+               #gpio-cells = <2>;
+               reg = <0x21>;
+       };
 };
 
 &cpm_spi1 {
@@ -140,10 +177,12 @@
 };
 
 &cpm_usb3_0 {
+       usb-phy = <&cpm_usb3_0_phy>;
        status = "okay";
 };
 
 &cpm_usb3_1 {
+       usb-phy = <&cpm_usb3_1_phy>;
        status = "okay";
 };