drivers/tty: Merge s3ve3g changes