Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index f994c7eaf41c..14fc011faa32 100644
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
         chip->chip.of_pwm_n_cells = 3;
         chip->chip.can_sleep = 1;
 
-        ret = pwmchip_add(&chip->chip);
+        ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
         if (ret) {
                 clk_disable_unprepare(hlcdc->periph_clk);
                 return ret;