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 / armada-388-helios4.dts

diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
index fb49df2..b3728de 100644 (file)
--- a/arch/arm/boot/dts/armada-388-helios4.dts
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
@@ -166,19 +166,19 @@
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
 
-                                       board_rev_bit_0 {
+                                       board-rev-bit-0-hog {
                                                gpio-hog;
                                                gpios = <0 GPIO_ACTIVE_LOW>;
                                                input;
                                                line-name = "board-rev-0";
                                        };
-                                       board_rev_bit_1 {
+                                       board-rev-bit-1-hog {
                                                gpio-hog;
                                                gpios = <1 GPIO_ACTIVE_LOW>;
                                                input;
                                                line-name = "board-rev-1";
                                        };
-                                       usb3_ilimit {
+                                       usb3-ilimit-hog {
                                                gpio-hog;
                                                gpios = <5 GPIO_ACTIVE_HIGH>;
                                                input;