summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-09-18 20:13:50 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-09-18 20:51:59 +0200
commit1966c1903fb4abf33b657e392f2fc11851b9e581 (patch)
treef39f178344565df48ff4535004313c368ca65910 /arch/arm/boot
parent1c45015944ec96c7f7fa75128ed08d398664bded (diff)
Colibri iMX6 dtb: make the power key low active
On the evaluation board is a pull down on this line, thus low active makes more sense.
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts2
-rw-r--r--arch/arm/boot/dts/imx6qdl-colibri.dtsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index a8544d8937ba..7fcff241ff8d 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -41,7 +41,7 @@
power {
label = "Power";
- gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
+ gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;
debounce-interval = <10>;
gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index b66ac402a31c..fb3ae1e51c30 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -312,7 +312,7 @@
};
pinctrl_gpio_keys: gpio_keys {
fsl,pins = <
- MX6QDL_PAD_EIM_A16__GPIO2_IO22 PAD_CTRL_HYS_PU /* Power Button */
+ MX6QDL_PAD_EIM_A16__GPIO2_IO22 PAD_CTRL_HYS_PD /* Power Button */
>;
};
pinctrl_i2c_ddc: i2c_ddc {