Merge branch 'n900-keys' into omap-for-v4.6/dt

diff --cc arch/arm/boot/dts/omap3-n900.dts
index 2ae38df,e2a629f..152511b
--- 1/arch/arm/boot/dts/omap3-n900.dts
--- 2/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@@ -65,51 -65,45 +65,46 @@@
                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>;
 -                      wakeup-source;
 +                      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>;
 -                      wakeup-source;
 +                      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>;
 -                      wakeup-source;
 +                      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>;
 -                      wakeup-source;
 +                      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>;
 -                      wakeup-source;
 +                      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;
                };
        };