summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-09-24 11:17:17 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2015-12-26 14:48:14 +0100
commit692d3279b3705a821c362cb4e3da3895f00c703f (patch)
treee4e3ea3bb3f3be3e52d7ffcc7e96f5e90bf84f1d /arch
parent818344f016b75ca24e904ff5f9a8f4b2235b31e1 (diff)
ARM: dts: imx6dl-colibri: use input dt-bindings
Rather than defining our own KEY_WAKEUP include the official input dt-bindings. While at it update copyright date range as well.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts4
-rw-r--r--arch/arm/boot/dts/imx6qdl-colibri.dtsi2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index de3bc78f29d0..8ef1d67ccca9 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Toradex AG
+ * Copyright 2014-2015 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -13,6 +13,7 @@
/dts-v1/;
+#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "imx6dl.dtsi"
#include "imx6qdl-colibri.dtsi"
@@ -40,7 +41,6 @@
mmc1 = &usdhc1; /* MMC 4bit slot */
};
- #define KEY_WAKEUP 143
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 26af83696f28..03806e896c5f 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Toradex AG
+ * Copyright 2014-2015 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*