Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 29 insertions, 0 deletions

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index f5acdaa52707..903138b18842 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -32,6 +32,9 @@
 
 #define MAX_PWMS 1024
 
+/* flags in the third cell of the DT PWM specifier */
+#define PWM_SPEC_POLARITY       (1 << 0)
+
 static DEFINE_MUTEX(pwm_lookup_lock);
 static LIST_HEAD(pwm_lookup_list);
 static DEFINE_MUTEX(pwm_lock);
@@ -129,6 +132,32 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
         return 0;
 }
 
+struct pwm_device *
+of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
+{
+        struct pwm_device *pwm;
+
+        if (pc->of_pwm_n_cells < 3)
+                return ERR_PTR(-EINVAL);
+
+        if (args->args[0] >= pc->npwm)
+                return ERR_PTR(-EINVAL);
+
+        pwm = pwm_request_from_chip(pc, args->args[0], NULL);
+        if (IS_ERR(pwm))
+                return pwm;
+
+        pwm_set_period(pwm, args->args[1]);
+
+        if (args->args[2] & PWM_SPEC_POLARITY)
+                pwm_set_polarity(pwm, PWM_POLARITY_INVERSED);
+        else
+                pwm_set_polarity(pwm, PWM_POLARITY_NORMAL);
+
+        return pwm;
+}
+EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags);
+
 static struct pwm_device *
 of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
 {