]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: armada-385-linksys: usb3 label cleanup
authorRalph Sennhauser <ralph.sennhauser@gmail.com>
Sun, 21 May 2017 12:48:55 +0000 (14:48 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Sat, 17 Jun 2017 06:16:46 +0000 (08:16 +0200)
Now that we use the reference for the USB3.0 port update the node name
and labels for the phy and vbus to match the label used by
armada-38x.dtsi.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/boot/dts/armada-385-linksys.dtsi

index 932fca4d64c3d438a752d0a6bd75cd98c95f4b89..6cc1ec7699ff3d50da7381a55225f1c917ba01ca 100644 (file)
@@ -63,16 +63,16 @@ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
                          MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
        };
 
-       usb3_phy: usb3_phy {
+       usb3_1_phy: usb3_1-phy {
                compatible = "usb-nop-xceiv";
-               vcc-supply = <&reg_xhci0_vbus>;
+               vcc-supply = <&usb3_1_vbus>;
        };
 
-       reg_xhci0_vbus: xhci0-vbus {
+       usb3_1_vbus: usb3_1-vbus {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
-               pinctrl-0 = <&xhci0_vbus_pins>;
-               regulator-name = "xhci0-vbus";
+               pinctrl-0 = <&usb3_1_vbus_pins>;
+               regulator-name = "usb3_1-vbus";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
                enable-active-high;
@@ -371,7 +371,7 @@ sata_led_pin: sata-led-pin {
                marvell,function = "gpio";
        };
 
-       xhci0_vbus_pins: xhci0-vbus-pins {
+       usb3_1_vbus_pins: usb3_1-vbus-pins {
                marvell,pins = "mpp50";
                marvell,function = "gpio";
        };
@@ -393,5 +393,5 @@ &usb0 {
 
 &usb3_1 {
        status = "okay";
-       usb-phy = <&usb3_phy>;
+       usb-phy = <&usb3_1_phy>;
 };