touchscreen: check for correct s2w enablement
Merge branch 'jb-mr2' into martincz