Merge branch 'for-next/pwm'

3 files changed, 11 insertions, 12 deletions

diff --git a/drivers/led/led-pwm.c b/drivers/led/led-pwm.c
index 16d22b5569..8a358dde88 100644
--- a/drivers/led/led-pwm.c
+++ b/drivers/led/led-pwm.c
@@ -41,6 +41,9 @@ static void led_pwm_set(struct led *led, unsigned int brightness)
         duty *= brightness;
         do_div(duty, max);
 
+	if (pwmled->active_low)
+		duty = pwmled->period - duty;
+
 	pwm_config(pwmled->pwm, duty, pwmled->period);
 }
 
@@ -54,16 +57,19 @@ static int led_pwm_of_probe(struct device_d *dev)
 		struct pwm_device *pwm;
 
 		pwm = of_pwm_request(child, NULL);
-		if (pwm < 0)
+		if (IS_ERR(pwm))
 			continue;
 
 		pwmled = xzalloc(sizeof(*pwmled));
 		pwmled->led.name = xstrdup(child->name);
 		pwmled->pwm = pwm;
 
-		of_property_read_u32(child, "max-brightness", &pwmled->led.max_value);
+		ret = of_property_read_u32(child, "max-brightness", &pwmled->led.max_value);
+		if (ret)
+			return ret;
 
 		pwmled->period = pwm_get_period(pwmled->pwm);
+		pwmled->active_low = of_property_read_bool(child, "active-low");
 
 		pwmled->led.set = led_pwm_set;
 
diff --git a/drivers/pwm/pxa_pwm.c b/drivers/pwm/pxa_pwm.c
index c7130c225e..4575817e94 100644
--- a/drivers/pwm/pxa_pwm.c
+++ b/drivers/pwm/pxa_pwm.c
@@ -34,8 +34,6 @@ struct pxa_pwm_chip {
 	struct pwm_chip chip;
 	void __iomem *iobase;
 	int id;
-	int duty_ns;
-	int period_ns;
 };
 
 static struct pxa_pwm_chip *to_pxa_pwm_chip(struct pwm_chip *chip)
@@ -72,15 +70,12 @@ static int pxa_pwm_config(struct pwm_chip *chip, int duty_ns, int period_ns)
 	else
 		dc = (pv + 1) * duty_ns / period_ns;
 
-	pxa_pwm->duty_ns = duty_ns;
-	pxa_pwm->period_ns = period_ns;
-
 	/* NOTE: the clock to PWM has to be enabled first
 	 * before writing to the registers
 	 */
-	__raw_writel(prescale, pxa_pwm->iobase + PWMCR);
-	__raw_writel(dc, pxa_pwm->iobase + PWMDCR);
-	__raw_writel(pv, pxa_pwm->iobase + PWMPCR);
+	writel(prescale, pxa_pwm->iobase + PWMCR);
+	writel(dc, pxa_pwm->iobase + PWMDCR);
+	writel(pv, pxa_pwm->iobase + PWMPCR);
 
 	return 0;
 }
diff --git a/drivers/video/backlight-pwm.c b/drivers/video/backlight-pwm.c
index 997235a74a..9111a42d75 100644
--- a/drivers/video/backlight-pwm.c
+++ b/drivers/video/backlight-pwm.c
@@ -204,8 +204,6 @@ static int backlight_pwm_of_probe(struct device_d *dev)
 		return PTR_ERR(pwm_backlight->power);
 	}
 
-	pwm_backlight->period = pwm_get_period(pwm_backlight->pwm);
-
 	pwm_backlight->backlight.slew_time_ms = 100;
 	pwm_backlight->backlight.brightness_set = backlight_pwm_set;
 	pwm_backlight->backlight.node = dev->device_node;