Merge kk-mr1
driver/input/touchscreen: add new s2w & dt2w implemenation from hammerhead

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/doubletap2wake: Fix compilation with earlysuspend

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/input/touchscreen/sweep2wake: Fix compilation with earlysuspend

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/input/touchscreen/sweep2wake: add mako definitions

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/input/touchscreen/sweep2wake: add flo/deb definitions

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/input/touchscreen/ektf3k: Add prevent_sleep functionality

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/input/touchscreen/ektf3k: do not suspend our irq if s2w/dt2w are compiled

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	drivers/input/touchscreen/ektf3k.c
drivers/input/touchscreen/sweep2wake: if s2s_only is true, opt out early

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Update defconfig for s2w/dt2w