diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-10-26 00:08:35 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-26 00:08:41 +0300 |
commit | e209b029c7d7f6205e510633d6ba966900b87ac2 (patch) | |
tree | 58aa726c97c5253fbe9d28d138c55d5d4c3af536 | |
parent | f0bb192440e6a86d17e078feed7a5779445c5ced (diff) | |
parent | 4a48fa417abc5b86da393c93ab63a9160076a248 (diff) | |
download | linux-e209b029c7d7f6205e510633d6ba966900b87ac2.tar.xz |
Merge tag 'samsung-dt-6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt
Samsung DTS ARM changes for v6.7, part two
Two minor improvements for Midas boards (Exynos4412, e.g. Samsung Galaxy S3):
1. Correct the middle hardware key to emit KEY_OK instead of KEY_MENU,
because there is already separate touchkey providing KEY_MENU and
both label and node name suggests this should be KEY_OK.
2. Use defines for other key input constants.
* tag 'samsung-dt-6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: samsung: exynos4412-midas: use Linux event codes for input keys
ARM: dts: samsung: exynos4412-midas: fix key-ok event code
Link: https://lore.kernel.org/r/20231024132615.65609-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi index 7daf25865551..3d5aace668dc 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi @@ -137,21 +137,21 @@ key-down { gpios = <&gpx3 3 GPIO_ACTIVE_LOW>; - linux,code = <114>; + linux,code = <KEY_VOLUMEDOWN>; label = "volume down"; debounce-interval = <10>; }; key-up { gpios = <&gpx2 2 GPIO_ACTIVE_LOW>; - linux,code = <115>; + linux,code = <KEY_VOLUMEUP>; label = "volume up"; debounce-interval = <10>; }; key-power { gpios = <&gpx2 7 GPIO_ACTIVE_LOW>; - linux,code = <116>; + linux,code = <KEY_POWER>; label = "power"; debounce-interval = <10>; wakeup-source; @@ -159,7 +159,7 @@ key-ok { gpios = <&gpx0 1 GPIO_ACTIVE_LOW>; - linux,code = <139>; + linux,code = <KEY_OK>; label = "ok"; debounce-interval = <10>; wakeup-source; |