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

This commit is contained in:
Tony Lindgren 2016-02-22 11:02:18 -08:00
Родитель ab8dd3aed0 97d7f2ff38
Коммит 8d08394f41
1 изменённых файлов: 9 добавлений и 14 удалений

Просмотреть файл

@ -65,50 +65,45 @@
camera_lens_cover { camera_lens_cover {
label = "Camera Lens Cover"; label = "Camera Lens Cover";
gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */ gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* 110 */
linux,input-type = <5>; /* EV_SW */ linux,input-type = <EV_SW>;
linux,code = <0x09>; /* SW_CAMERA_LENS_COVER */ linux,code = <SW_CAMERA_LENS_COVER>;
wakeup-source;
linux,can-disable; linux,can-disable;
}; };
camera_focus { camera_focus {
label = "Camera Focus"; label = "Camera Focus";
gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */ gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; /* 68 */
linux,code = <0x210>; /* KEY_CAMERA_FOCUS */ linux,code = <KEY_CAMERA_FOCUS>;
wakeup-source;
linux,can-disable; linux,can-disable;
}; };
camera_capture { camera_capture {
label = "Camera Capture"; label = "Camera Capture";
gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */ gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* 69 */
linux,code = <0xd4>; /* KEY_CAMERA */ linux,code = <KEY_CAMERA>;
wakeup-source;
linux,can-disable; linux,can-disable;
}; };
lock_button { lock_button {
label = "Lock Button"; label = "Lock Button";
gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */ gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* 113 */
linux,code = <0x98>; /* KEY_SCREENLOCK */ linux,code = <KEY_SCREENLOCK>;
wakeup-source;
linux,can-disable; linux,can-disable;
}; };
keypad_slide { keypad_slide {
label = "Keypad Slide"; label = "Keypad Slide";
gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */ gpios = <&gpio3 7 GPIO_ACTIVE_LOW>; /* 71 */
linux,input-type = <5>; /* EV_SW */ linux,input-type = <EV_SW>;
linux,code = <0x0a>; /* SW_KEYPAD_SLIDE */ linux,code = <SW_KEYPAD_SLIDE>;
wakeup-source;
linux,can-disable; linux,can-disable;
}; };
proximity_sensor { proximity_sensor {
label = "Proximity Sensor"; label = "Proximity Sensor";
gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>; /* 89 */ gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>; /* 89 */
linux,input-type = <5>; /* EV_SW */ linux,input-type = <EV_SW>;
linux,code = <0x0b>; /* SW_FRONT_PROXIMITY */ linux,code = <SW_FRONT_PROXIMITY>;
linux,can-disable; linux,can-disable;
}; };
}; };