Merge branches 'acpi-video', 'device-properties', 'pm-sleep' and 'pm-cpuidle'

[cascardo/linux.git] / drivers / pwm / pwm-bcm-kona.c

diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c
index 02bc048..7af8fea 100644 (file)
--- a/drivers/pwm/pwm-bcm-kona.c
+++ b/drivers/pwm/pwm-bcm-kona.c
@@ -266,18 +266,15 @@ static int kona_pwmc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       /* Set smooth mode, push/pull, and normal polarity for all channels */
-       for (chan = 0; chan < kp->chip.npwm; chan++) {
-               value |= (1 << PWM_CONTROL_SMOOTH_SHIFT(chan));
+       /* Set push/pull for all channels */
+       for (chan = 0; chan < kp->chip.npwm; chan++)
                value |= (1 << PWM_CONTROL_TYPE_SHIFT(chan));
-               value |= (1 << PWM_CONTROL_POLARITY_SHIFT(chan));
-       }
 
        writel(value, kp->base + PWM_CONTROL_OFFSET);
 
        clk_disable_unprepare(kp->clk);
 
-       ret = pwmchip_add(&kp->chip);
+       ret = pwmchip_add_with_polarity(&kp->chip, PWM_POLARITY_INVERSED);
        if (ret < 0)
                dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);