diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-10-15 14:25:37 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-10-15 14:45:18 +0200 |
| commit | 90619dc0b334b144f70ca1f71fd437ac817252e3 (patch) | |
| tree | 18c74c00e89561f94e29bff79c2ee1eaab87d511 | |
| parent | 1ce9413bb35208dc647cb61ef093d0ab3cfa340d (diff) | |
ARM: dts: Apalis/Colibri dts: use input dt-bindings
Use commit e11011a0578101b2f0f9a066d13beeb2c2da5fcc on all device-trees:
Rather than defining our own KEY_WAKEUP include the official input
dt-bindings.
While at it update copyright date range as well.
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-eval.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 |
5 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 6ce793289114..1f49c7a5a4ed 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.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 "imx6q.dtsi" #include "imx6qdl-apalis.dtsi" diff --git a/arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts b/arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts index 5c1c53451427..bdf8ac32ee18 100644 --- a/arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis_v1_0-eval.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 "imx6q.dtsi" /* on HW V1.0 all RxD/TxD lines are routed in a DCE way, all control lines (RTS/...) diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi index 0087d522dae6..de446618f0c3 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -1,5 +1,5 @@ /* - * Copyright 2014 Toradex AG + * Copyright 2014-2015 Toradex AG * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * @@ -33,7 +33,6 @@ rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34"; }; - #define KEY_WAKEUP 143 gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 23663209408e..eb2aa0eaa6f4 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -1,5 +1,5 @@ /* - * Copyright 2014 Toradex AG + * Copyright 2014-2015 Toradex AG * Copyright 2012 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * @@ -10,7 +10,6 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ -//#include <include/dt-bindings/input/input.h> / { model = "Toradex Apalis iMX6Q Module"; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 2a44aa6fb4bf..63ac59ea40d5 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -10,7 +10,6 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ -//#include <dt-bindings/input/input.h> / { model = "Toradex Colibri iMX6DL/S Module"; |