Sync with upstream driver

Signed-off-by: Guenter Roeck <linux@roeck-us.net>