mms152_ts/wacom: build/bug fixes

fixed build error, and bugs affecting the s-pen touchkey/touchscreen block