Revert "Synaptics: s2w added"

This reverts commit 6569112a18cd257a6c028473327f8ec1b3514d4f.