Merge tag 'for-3.11-rc1' of git://gitorious.org/linux-pwm/linux-pwm

Pull pwm changes from Thierry Reding:
 "A new driver supports driving PWM signals using the TPU unit found on
  various Renesas SoCs.  Furthermore support is added for the NXP
  PCA9685 LED controller.  Another big chunk is the sysfs interface
  which has been in the works for quite some time.

  The remaining patches are a random assortment of cleanups and fixes"

* tag 'for-3.11-rc1' of git://gitorious.org/linux-pwm/linux-pwm:
  pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.
  pwm: pca9685: Fix wrong argument to set MODE1_SLEEP bit
  pwm: renesas-tpu: Add MODULE_ALIAS to make module auto loading work
  pwm: renesas-tpu: fix return value check in tpu_probe()
  pwm: Add Renesas TPU PWM driver
  pwm: Add sysfs interface
  pwm: Fill in missing .owner fields
  pwm: add pca9685 driver
  pwm: atmel-tcb: prepare clk before calling enable
  pwm: devm: alloc correct pointer size
  pwm: mxs: Let device core handle pinctrl
  MAINTAINERS: Update PWM subsystem entry

1 files changed, 25 insertions, 4 deletions

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 32221cb0cbe7..dfbfbc521768 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -274,6 +274,8 @@ int pwmchip_add(struct pwm_chip *chip)
         if (IS_ENABLED(CONFIG_OF))
                 of_pwmchip_add(chip);
 
+        pwmchip_sysfs_export(chip);
+
 out:
         mutex_unlock(&pwm_lock);
         return ret;
@@ -310,6 +312,8 @@ int pwmchip_remove(struct pwm_chip *chip)
 
         free_pwms(chip);
 
+        pwmchip_sysfs_unexport(chip);
+
 out:
         mutex_unlock(&pwm_lock);
         return ret;
@@ -402,10 +406,19 @@ EXPORT_SYMBOL_GPL(pwm_free);
  */
 int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
 {
+        int err;
+
         if (!pwm || duty_ns < 0 || period_ns <= 0 || duty_ns > period_ns)
                 return -EINVAL;
 
-        return pwm->chip->ops->config(pwm->chip, pwm, duty_ns, period_ns);
+        err = pwm->chip->ops->config(pwm->chip, pwm, duty_ns, period_ns);
+        if (err)
+                return err;
+
+        pwm->duty_cycle = duty_ns;
+        pwm->period = period_ns;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(pwm_config);
 
@@ -418,6 +431,8 @@ EXPORT_SYMBOL_GPL(pwm_config);
  */
 int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity)
 {
+        int err;
+
         if (!pwm || !pwm->chip->ops)
                 return -EINVAL;
 
@@ -427,7 +442,13 @@ int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity)
         if (test_bit(PWMF_ENABLED, &pwm->flags))
                 return -EBUSY;
 
-        return pwm->chip->ops->set_polarity(pwm->chip, pwm, polarity);
+        err = pwm->chip->ops->set_polarity(pwm->chip, pwm, polarity);
+        if (err)
+                return err;
+
+        pwm->polarity = polarity;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(pwm_set_polarity);
 
@@ -694,7 +715,7 @@ struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id)
 {
         struct pwm_device **ptr, *pwm;
 
-        ptr = devres_alloc(devm_pwm_release, sizeof(**ptr), GFP_KERNEL);
+        ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL);
         if (!ptr)
                 return ERR_PTR(-ENOMEM);
 
@@ -724,7 +745,7 @@ struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
 {
         struct pwm_device **ptr, *pwm;
 
-        ptr = devres_alloc(devm_pwm_release, sizeof(**ptr), GFP_KERNEL);
+        ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL);
         if (!ptr)
                 return ERR_PTR(-ENOMEM);