drivers/input/keyboard: Merge s3ve3g changes