Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6qdl-zii-rdu2.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index 66b1574..c0a7620 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -330,28 +330,28 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpio3_hog>;
 
-       usb-emulation {
+       usb-emulation-hog {
                gpio-hog;
                gpios = <19 GPIO_ACTIVE_HIGH>;
                output-low;
                line-name = "usb-emulation";
        };
 
-       usb-mode1 {
+       usb-mode1-hog {
                gpio-hog;
                gpios = <20 GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "usb-mode1";
        };
 
-       usb-pwr {
+       usb-pwr-hog {
                gpio-hog;
                gpios = <22 GPIO_ACTIVE_LOW>;
                output-high;
                line-name = "usb-pwr-ctrl-en-n";
        };
 
-       usb-mode2 {
+       usb-mode2-hog {
                gpio-hog;
                gpios = <23 GPIO_ACTIVE_HIGH>;
                output-high;