Skip to content

Commit e209b02

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f0bb192 + 4a48fa4 commit e209b02

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm/boot/dts/samsung/exynos4412-midas.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,29 @@
137137

138138
key-down {
139139
gpios = <&gpx3 3 GPIO_ACTIVE_LOW>;
140-
linux,code = <114>;
140+
linux,code = <KEY_VOLUMEDOWN>;
141141
label = "volume down";
142142
debounce-interval = <10>;
143143
};
144144

145145
key-up {
146146
gpios = <&gpx2 2 GPIO_ACTIVE_LOW>;
147-
linux,code = <115>;
147+
linux,code = <KEY_VOLUMEUP>;
148148
label = "volume up";
149149
debounce-interval = <10>;
150150
};
151151

152152
key-power {
153153
gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
154-
linux,code = <116>;
154+
linux,code = <KEY_POWER>;
155155
label = "power";
156156
debounce-interval = <10>;
157157
wakeup-source;
158158
};
159159

160160
key-ok {
161161
gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;
162-
linux,code = <139>;
162+
linux,code = <KEY_OK>;
163163
label = "ok";
164164
debounce-interval = <10>;
165165
wakeup-source;

0 commit comments

Comments
 (0)