summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Dolcini <francesco.dolcini@toradex.com>2023-03-06 14:34:42 +0100
committerFrancesco Dolcini <francesco.dolcini@toradex.com>2023-03-06 14:48:26 +0100
commit46e9f787db0921882f143a11018911128564206e (patch)
tree1486a76fb22acc35c680c9e25ad1ad69b68c8c0c
parent5a1dae82662f2d6aa1b8c74a68049321d87c159c (diff)
arm64: dts: ti: k3-am625-verdin: fix WAKE1_MICO# gpio-key
Move WAKE1_MICO# pinctrl configuration to parent gpio-keys node, and keep the whole gpio-keys node disabled. This way the pins are correctly configured when enabled, and nothing is done when disabled. KEY_WAKEUP input event is working after this change, however the `wakeup-source` functionality is not tested as of now and the kernel prints the following error: gpio-keys gpio-keys: failed to configure IRQ 383 as wakeup source: -6 Upstream-Status: Pending Initial DTS to be used for bring-up an validation of the V1.0 design, we'll decide on the step forward to mainline this once the bring-up and validation will be done. Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
-rw-r--r--arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi2
-rw-r--r--arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi b/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi
index e2f80c899cab..65d2cffacdad 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi
@@ -211,7 +211,7 @@
};
/* Verdin CTRL_WAKE1_MICO# */
-&verdin_key_wakeup {
+&verdin_gpio_keys {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi
index 507b0237b6e7..46108a4a4255 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi
@@ -86,19 +86,19 @@
id-gpios = <&main_gpio1 19 GPIO_ACTIVE_HIGH>;
};
- gpio-keys {
+ verdin_gpio_keys: gpio-keys {
compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ctrl_wake1_mico>;
+ status = "disabled";
verdin_key_wakeup: key-wakeup {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_ctrl_wake1_mico>;
debounce-interval = <10>;
/* Verdin CTRL_WAKE1_MICO# (SODIMM 252) */
gpios = <&main_gpio0 32 GPIO_ACTIVE_LOW>;
label = "Wake-Up";
linux,code = <KEY_WAKEUP>;
wakeup-source;
- status = "disabled";
};
};