drivers/thermal: Merge s3ve3g changes