Merge branch 'for-4.11/drivers' into for-next

diff --cc drivers/pwm/pwm-imx.c
index 1223187ad354099a70b562a1173ab6149fba74a6,957099e82ed3783d0ec1a1fd455570e55c0e20f7..2ba5c3a398ff6605141ff39aca16db365e602b9a
--- 1/drivers/pwm/pwm-imx.c
--- 2/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@@ -304,7 -289,14 +289,13 @@@ static int imx_pwm_probe(struct platfor
        imx->chip.dev = &pdev->dev;
        imx->chip.base = -1;
        imx->chip.npwm = 1;
 -      imx->chip.can_sleep = true;
  
+       if (data->polarity_supported) {
+               dev_dbg(&pdev->dev, "PWM supports output inversion\n");
+               imx->chip.of_xlate = of_pwm_xlate_with_flags;
+               imx->chip.of_pwm_n_cells = 3;
+       }
+ 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        imx->mmio_base = devm_ioremap_resource(&pdev->dev, r);
        if (IS_ERR(imx->mmio_base))

diff --cc drivers/pwm/pwm-pca9685.c
index c8282a2650be897557a83e361d7e3bb1d1a6ed90,5566760f7dc4df40b0ce105df4bf33f18de46407..0cfb3571a7325519cb5aec77ce16bf71921b6846
--- 1/drivers/pwm/pwm-pca9685.c
--- 2/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@@ -343,8 -486,17 +486,16 @@@ static int pca9685_pwm_probe(struct i2c
  
        pca->chip.dev = &client->dev;
        pca->chip.base = -1;
 -      pca->chip.can_sleep = true;
  
-       return pwmchip_add(&pca->chip);
+       ret = pwmchip_add(&pca->chip);
+       if (ret < 0)
+               return ret;
+ 
+       ret = pca9685_pwm_gpio_probe(pca);
+       if (ret < 0)
+               pwmchip_remove(&pca->chip);
+ 
+       return ret;
  }
  
  static int pca9685_pwm_remove(struct i2c_client *client)