Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt

[karo-tx-linux.git] / arch / arm / boot / dts / bcm4709-asus-rt-ac87u.dts

diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
index eaca6876db0f22395bfde65c2527d05bce6747f9..df473cc41572932722d7a9de14b5711df5df976f 100644 (file)
--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.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,7 +41,6 @@
                wps {
                        label = "bcm53xx:blue:wps";
                        gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
 
                power {
@@ -43,7 +52,6 @@
                wan {
                        label = "bcm53xx:red:wan";
                        gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "default-off";
                };
        };