diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-02-22 20:02:18 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-22 20:02:18 +0100 |
| commit | 8d08394f41070ac141c1eb441f3ff31919f6440a (patch) | |
| tree | e12f36dc23d57ef9a8364fa9ae98af332065714c | |
| parent | ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV (diff) | |
| parent | ARM: dts: n900: Use linux input defines instead hardcoded constants (diff) | |
| download | linux-8d08394f41070ac141c1eb441f3ff31919f6440a.tar.xz linux-8d08394f41070ac141c1eb441f3ff31919f6440a.zip | |
Merge branch 'n900-keys' into omap-for-v4.6/dt
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 2ae38dfea61e..152511be5b1e 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -65,50 +65,45 @@ camera_lens_cover { label = "Camera Lens Cover"; gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */ - linux,input-type = <5>; /* EV_SW */ - linux,code = <0x09>; /* SW_CAMERA_LENS_COVER */ - wakeup-source; + linux,input-type = <EV_SW>; + linux,code = <SW_CAMERA_LENS_COVER>; linux,can-disable; }; camera_focus { label = "Camera Focus"; gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */ - linux,code = <0x210>; /* KEY_CAMERA_FOCUS */ - wakeup-source; + linux,code = <KEY_CAMERA_FOCUS>; linux,can-disable; }; camera_capture { label = "Camera Capture"; gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */ - linux,code = <0xd4>; /* KEY_CAMERA */ - wakeup-source; + linux,code = <KEY_CAMERA>; linux,can-disable; }; lock_button { label = "Lock Button"; gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */ - linux,code = <0x98>; /* KEY_SCREENLOCK */ - wakeup-source; + linux,code = <KEY_SCREENLOCK>; linux,can-disable; }; keypad_slide { label = "Keypad Slide"; gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */ - linux,input-type = <5>; /* EV_SW */ - linux,code = <0x0a>; /* SW_KEYPAD_SLIDE */ - wakeup-source; + linux,input-type = <EV_SW>; + linux,code = <SW_KEYPAD_SLIDE>; linux,can-disable; }; proximity_sensor { label = "Proximity Sensor"; gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>; /* 89 */ - linux,input-type = <5>; /* EV_SW */ - linux,code = <0x0b>; /* SW_FRONT_PROXIMITY */ + linux,input-type = <EV_SW>; + linux,code = <SW_FRONT_PROXIMITY>; linux,can-disable; }; }; |