drivers/char: Merge s3ve3g changes