Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm4708-asus-rt-ac56u.dts

diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index d241cee4bfcca92451721a1217fe4c446ef69aba..4175174e589a50ec388e795cc4bdc2ea1f0f31f6 100644 (file)
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@ -4,7 +4,17 @@
  *
  * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
  *
- * Licensed under the GNU/GPL. See COPYING for details.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /dts-v1/;
@@ -31,19 +41,16 @@
                usb3 {
                        label = "bcm53xx:blue:usb3";
                        gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
 
                wan {
                        label = "bcm53xx:blue:wan";
                        gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
 
                lan {
                        label = "bcm53xx:blue:lan";
                        gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
 
                power {
@@ -61,14 +68,12 @@
                2ghz {
                        label = "bcm53xx:blue:2ghz";
                        gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
 
 
                usb2 {
                        label = "bcm53xx:blue:usb2";
                        gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
        };