i2c: bma250: gyro wake - keep sensor enabled when F2S is present

To let it work, when android framework would otherwise not
use the sensor (e.g. auto rotation is off)
board-m7: rework lightsensor and proximity sensor table

proximity now instantly choosing distance also during phone
calls it waits 1 sec before allowing screen to response again
this prevents issues when there is a split second more light
available to the sensor and in that case the screen would
directly turn on while you are still calling

Change-Id: Id2df6bc9a21bb7bdb448854f6602556fbd03d1c6
Merge branch 'cm-10.2' of git@github.com:ICJm7-cm102/android_kernel_htc_m7.git into cm-10.2