|
@@ -602,12 +602,9 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
|
|
struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);
|
|
struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);
|
|
const char *dev_id = dev ? dev_name(dev) : NULL;
|
|
const char *dev_id = dev ? dev_name(dev) : NULL;
|
|
struct pwm_chip *chip = NULL;
|
|
struct pwm_chip *chip = NULL;
|
|
- unsigned int index = 0;
|
|
|
|
unsigned int best = 0;
|
|
unsigned int best = 0;
|
|
- struct pwm_lookup *p;
|
|
|
|
|
|
+ struct pwm_lookup *p, *chosen = NULL;
|
|
unsigned int match;
|
|
unsigned int match;
|
|
- unsigned int period;
|
|
|
|
- enum pwm_polarity polarity;
|
|
|
|
|
|
|
|
/* look up via DT first */
|
|
/* look up via DT first */
|
|
if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
|
|
if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
|
|
@@ -653,10 +650,7 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
|
|
}
|
|
}
|
|
|
|
|
|
if (match > best) {
|
|
if (match > best) {
|
|
- chip = pwmchip_find_by_name(p->provider);
|
|
|
|
- index = p->index;
|
|
|
|
- period = p->period;
|
|
|
|
- polarity = p->polarity;
|
|
|
|
|
|
+ chosen = p;
|
|
|
|
|
|
if (match != 3)
|
|
if (match != 3)
|
|
best = match;
|
|
best = match;
|
|
@@ -665,17 +659,22 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- mutex_unlock(&pwm_lookup_lock);
|
|
|
|
|
|
+ if (!chosen)
|
|
|
|
+ goto out;
|
|
|
|
|
|
- if (chip)
|
|
|
|
- pwm = pwm_request_from_chip(chip, index, con_id ?: dev_id);
|
|
|
|
- if (IS_ERR(pwm))
|
|
|
|
- return pwm;
|
|
|
|
|
|
+ chip = pwmchip_find_by_name(chosen->provider);
|
|
|
|
+ if (!chip)
|
|
|
|
+ goto out;
|
|
|
|
|
|
- pwm_set_period(pwm, period);
|
|
|
|
- pwm_set_polarity(pwm, polarity);
|
|
|
|
|
|
+ pwm = pwm_request_from_chip(chip, chosen->index, con_id ?: dev_id);
|
|
|
|
+ if (IS_ERR(pwm))
|
|
|
|
+ goto out;
|
|
|
|
|
|
|
|
+ pwm_set_period(pwm, chosen->period);
|
|
|
|
+ pwm_set_polarity(pwm, chosen->polarity);
|
|
|
|
|
|
|
|
+out:
|
|
|
|
+ mutex_unlock(&pwm_lookup_lock);
|
|
return pwm;
|
|
return pwm;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(pwm_get);
|
|
EXPORT_SYMBOL_GPL(pwm_get);
|