Skip to content

Commit

Permalink
Merge tag 'samsung-dt-6.7-2' of https://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Arnd Bergmann committed Oct 25, 2023
2 parents f0bb192 + 4a48fa4 commit e209b02
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -137,29 +137,29 @@

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;
};

key-ok {
gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;
linux,code = <139>;
linux,code = <KEY_OK>;
label = "ok";
debounce-interval = <10>;
wakeup-source;
Expand Down

0 comments on commit e209b02

Please sign in to comment.