Squash and apply the following changes taken from the msm-3.14
kernel branch as of msm-3.14
commit 8139d0b4e7a6d ("ARM: dts: msm: Set flag to manage clks")
commit c24a3df92a457643cc0821eb9e8f392ae5a907ee
Author: Amy Maloche <amaloche@codeaurora.org>
Date: Thu May 9 10:23:41 2013 -0700
input: gen_vkeys: Make y_offset an optional property
Not all targets will need the y coordinate shifted to
function properly, so set this value as default 0.
Change-Id: I1816433c3601fe099ffb8ee275637e573990e432
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Documentation/devicetree/bindings/input/gen_vkeys.txt
drivers/input/touchscreen/gen_vkeys.c
2 files changed, 13 insertions(+), 5 deletions(-)
commit bb2ac18f8fab38fa12d8a7d8b7ee80d9c0049329
Author: Amy Maloche <amaloche@codeaurora.org>
Date: Wed Apr 17 12:15:56 2013 -0700
vkeys: gen_vkeys: Add key position offset
Add virtual key position offset to match virtual key
positions with front panel.
Change-Id: Ibbf89e816d9654f202b75470df0c673aa42439c8
Acked-by: Chun Zhang <chunz@qti.qualcomm.com>
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Documentation/devicetree/bindings/input/gen_vkeys.txt
drivers/input/touchscreen/gen_vkeys.c
include/linux/input/gen_vkeys.h
3 files changed, 10 insertions(+), 2 deletions(-)
commit 1a6d213cf5a3e40d8b39507e2b010dc81de63630
Author: Mohan Pallaka <mpallaka@codeaurora.org>
Date: Wed Aug 8 11:25:52 2012 +0530
input: Add support for virtual key generation
Virtual keys are used for navigation on Android.
These are not specific to the controller used
in the target but are specific to the target.
Add a module to generate virtual keys independently
of the controller.
Change-Id: I0c86dc77f1bc53c283e990be419c2715edf4e1c0
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
[stepanm@codeaurora.org: resolve Kconfig conflicts]
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
.../devicetree/bindings/input/gen_vkeys.txt
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/gen_vkeys.c
include/linux/input/gen_vkeys.h
5 files changed, 278 insertions(+)
Change-Id: Ie0e14d201a42632af57ff23dc85cec8881125e5a
Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
4377fa96aa