Merge remote-tracking branch 'pwm/for-next'

Conflicts:
	drivers/leds/leds-pwm.c

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc drivers/leds/leds-pwm.c
index f5cf1b0f274873d9142a008dff9e024b6da3251d,aa770ec1e8928cc6b8f8eeaf9d6daea314e46d65..68d9e3424896e213393fcd65dca0545497ba398c
--- 1/drivers/leds/leds-pwm.c
--- 2/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@@ -96,75 -92,55 +96,75 @@@ static void led_pwm_cleanup(struct led_
        }
  }
  
 -static int led_pwm_create_of(struct platform_device *pdev,
 -                           struct led_pwm_priv *priv)
 +static int led_pwm_add(struct device *dev, struct led_pwm_priv *priv,
 +                     struct led_pwm *led, struct device_node *child)
  {
 -      struct device_node *child;
 +      struct led_pwm_data *led_data = &priv->leds[priv->num_leds];
        int ret;
  
 -      for_each_child_of_node(pdev->dev.of_node, child) {
 -              struct led_pwm_data *led_dat = &priv->leds[priv->num_leds];
 +      led_data->active_low = led->active_low;
-       led_data->period = led->pwm_period_ns;
 +      led_data->cdev.name = led->name;
 +      led_data->cdev.default_trigger = led->default_trigger;
 +      led_data->cdev.brightness_set = led_pwm_set;
 +      led_data->cdev.brightness = LED_OFF;
 +      led_data->cdev.max_brightness = led->max_brightness;
 +      led_data->cdev.flags = LED_CORE_SUSPENDRESUME;
  
 -              led_dat->cdev.name = of_get_property(child, "label",
 -                                                   NULL) ? : child->name;
 +      if (child)
 +              led_data->pwm = devm_of_pwm_get(dev, child, NULL);
 +      else
 +              led_data->pwm = devm_pwm_get(dev, led->name);
 +      if (IS_ERR(led_data->pwm)) {
 +              ret = PTR_ERR(led_data->pwm);
 +              dev_err(dev, "unable to request PWM for %s: %d\n",
 +                      led->name, ret);
 +              return ret;
 +      }
  
-       if (child)
-               led_data->period = pwm_get_period(led_data->pwm);
 -              led_dat->pwm = devm_of_pwm_get(&pdev->dev, child, NULL);
 -              if (IS_ERR(led_dat->pwm)) {
 -                      dev_err(&pdev->dev, "unable to request PWM for %s\n",
 -                              led_dat->cdev.name);
 -                      ret = PTR_ERR(led_dat->pwm);
 -                      goto err;
 -              }
 -              /* Get the period from PWM core when n*/
 -              led_dat->period = pwm_get_period(led_dat->pwm);
++      led_data->period = pwm_get_period(led_data->pwm);
++      if (!led_data->period && (led->pwm_period_ns > 0))
++              led_data->period = led->pwm_period_ns;
  
 -              led_dat->cdev.default_trigger = of_get_property(child,
 -                                              "linux,default-trigger", NULL);
 -              of_property_read_u32(child, "max-brightness",
 -                                   &led_dat->cdev.max_brightness);
 +      led_data->can_sleep = pwm_can_sleep(led_data->pwm);
 +      if (led_data->can_sleep)
 +              INIT_WORK(&led_data->work, led_pwm_work);
 +
 +      ret = led_classdev_register(dev, &led_data->cdev);
 +      if (ret == 0) {
 +              priv->num_leds++;
 +      } else {
 +              dev_err(dev, "failed to register PWM led for %s: %d\n",
 +                      led->name, ret);
 +      }
 +
 +      return ret;
 +}
 +
 +static int led_pwm_create_of(struct device *dev, struct led_pwm_priv *priv)
 +{
 +      struct device_node *child;
 +      struct led_pwm led;
 +      int ret = 0;
 +
 +      memset(&led, 0, sizeof(led));
  
 -              led_dat->cdev.brightness_set = led_pwm_set;
 -              led_dat->cdev.brightness = LED_OFF;
 -              led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
 +      for_each_child_of_node(dev->of_node, child) {
 +              led.name = of_get_property(child, "label", NULL) ? :
 +                         child->name;
  
 -              led_dat->can_sleep = pwm_can_sleep(led_dat->pwm);
 -              if (led_dat->can_sleep)
 -                      INIT_WORK(&led_dat->work, led_pwm_work);
 +              led.default_trigger = of_get_property(child,
 +                                              "linux,default-trigger", NULL);
 +              led.active_low = of_property_read_bool(child, "active-low");
 +              of_property_read_u32(child, "max-brightness",
 +                                   &led.max_brightness);
  
 -              ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
 -              if (ret < 0) {
 -                      dev_err(&pdev->dev, "failed to register for %s\n",
 -                              led_dat->cdev.name);
 +              ret = led_pwm_add(dev, priv, &led, child);
 +              if (ret) {
                        of_node_put(child);
 -                      goto err;
 +                      break;
                }
 -              priv->num_leds++;
        }
  
 -      return 0;
 -err:
 -      led_pwm_cleanup(priv);
 -
        return ret;
  }
  

diff --cc drivers/pwm/pwm-spear.c
Simple merge