From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
To: thierry.reding@gmail.com, u.kleine-koenig@pengutronix.de
Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org,
Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Subject: [PATCH 2/4] pwm: pca9685: remove ALL_LED PWM channel
Date: Wed, 26 Feb 2020 14:52:27 +0100 [thread overview]
Message-ID: <20200226135229.24929-2-matthias.schiffer@ew.tq-group.com> (raw)
In-Reply-To: <20200226135229.24929-1-matthias.schiffer@ew.tq-group.com>
The interaction of the ALL_LED PWM channel with the other channels was
not well-defined. As the ALL_LED feature does not seem very useful and
it was making the code significantly more complex, simply remove it.
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
drivers/pwm/pwm-pca9685.c | 115 ++++++--------------------------------
1 file changed, 17 insertions(+), 98 deletions(-)
diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
index 19ac97108a64..393ab92aa945 100644
--- a/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@ -105,27 +105,12 @@ static int pca9685_pwm_gpio_request(struct gpio_chip *gpio, unsigned int offset)
static bool pca9685_pwm_is_gpio(struct pca9685 *pca, struct pwm_device *pwm)
{
- bool is_gpio = false;
+ bool is_gpio;
mutex_lock(&pca->lock);
-
- if (pwm->hwpwm >= PCA9685_MAXCHAN) {
- unsigned int i;
-
- /*
- * Check if any of the GPIOs are requested and in that case
- * prevent using the "all LEDs" channel.
- */
- for (i = 0; i < pca->gpio.ngpio; i++)
- if (gpiochip_is_requested(&pca->gpio, i)) {
- is_gpio = true;
- break;
- }
- } else if (pwm_get_chip_data(pwm)) {
- is_gpio = true;
- }
-
+ is_gpio = !!pwm_get_chip_data(pwm);
mutex_unlock(&pca->lock);
+
return is_gpio;
}
@@ -239,7 +224,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
{
struct pca9685 *pca = to_pca(chip);
unsigned long long duty;
- unsigned int reg;
int prescale;
if (period_ns != pca->period_ns) {
@@ -272,39 +256,18 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
}
if (duty_ns < 1) {
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_H;
- else
- reg = LED_N_OFF_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, LED_FULL);
+ regmap_write(pca->regmap, LED_N_OFF_H(pwm->hwpwm), LED_FULL);
return 0;
}
if (duty_ns == period_ns) {
/* Clear both OFF registers */
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_L;
- else
- reg = LED_N_OFF_L(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0x0);
-
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_H;
- else
- reg = LED_N_OFF_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0x0);
+ regmap_write(pca->regmap, LED_N_OFF_L(pwm->hwpwm), 0x0);
+ regmap_write(pca->regmap, LED_N_OFF_H(pwm->hwpwm), 0x0);
/* Set the full ON bit */
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_ON_H;
- else
- reg = LED_N_ON_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, LED_FULL);
+ regmap_write(pca->regmap, LED_N_ON_H(pwm->hwpwm), LED_FULL);
return 0;
}
@@ -312,27 +275,12 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
duty = PCA9685_COUNTER_RANGE * (unsigned long long)duty_ns;
duty = DIV_ROUND_UP_ULL(duty, period_ns);
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_L;
- else
- reg = LED_N_OFF_L(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, (int)duty & 0xff);
-
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_H;
- else
- reg = LED_N_OFF_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, ((int)duty >> 8) & 0xf);
+ regmap_write(pca->regmap, LED_N_OFF_L(pwm->hwpwm), (int)duty & 0xff);
+ regmap_write(pca->regmap, LED_N_OFF_H(pwm->hwpwm),
+ ((int)duty >> 8) & 0xf);
/* Clear the full ON bit, otherwise the set OFF time has no effect */
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_ON_H;
- else
- reg = LED_N_ON_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0);
+ regmap_write(pca->regmap, LED_N_ON_H(pwm->hwpwm), 0);
return 0;
}
@@ -340,36 +288,19 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
static int pca9685_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct pca9685 *pca = to_pca(chip);
- unsigned int reg;
/*
* The PWM subsystem does not support a pre-delay.
* So, set the ON-timeout to 0
*/
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_ON_L;
- else
- reg = LED_N_ON_L(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0);
-
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_ON_H;
- else
- reg = LED_N_ON_H(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0);
+ regmap_write(pca->regmap, LED_N_ON_L(pwm->hwpwm), 0);
+ regmap_write(pca->regmap, LED_N_ON_H(pwm->hwpwm), 0);
/*
* Clear the full-off bit.
* It has precedence over the others and must be off.
*/
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_H;
- else
- reg = LED_N_OFF_H(pwm->hwpwm);
-
- regmap_update_bits(pca->regmap, reg, LED_FULL, 0x0);
+ regmap_update_bits(pca->regmap, LED_N_OFF_H(pwm->hwpwm), LED_FULL, 0x0);
return 0;
}
@@ -377,22 +308,11 @@ static int pca9685_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
static void pca9685_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct pca9685 *pca = to_pca(chip);
- unsigned int reg;
-
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_H;
- else
- reg = LED_N_OFF_H(pwm->hwpwm);
- regmap_write(pca->regmap, reg, LED_FULL);
+ regmap_write(pca->regmap, LED_N_OFF_H(pwm->hwpwm), LED_FULL);
/* Clear the LED_OFF counter. */
- if (pwm->hwpwm >= PCA9685_MAXCHAN)
- reg = PCA9685_ALL_LED_OFF_L;
- else
- reg = LED_N_OFF_L(pwm->hwpwm);
-
- regmap_write(pca->regmap, reg, 0x0);
+ regmap_write(pca->regmap, LED_N_OFF_L(pwm->hwpwm), 0x0);
}
static int pca9685_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
@@ -469,8 +389,7 @@ static int pca9685_pwm_probe(struct i2c_client *client,
regmap_write(pca->regmap, PCA9685_ALL_LED_OFF_H, 0);
pca->chip.ops = &pca9685_pwm_ops;
- /* add an extra channel for ALL_LED */
- pca->chip.npwm = PCA9685_MAXCHAN + 1;
+ pca->chip.npwm = PCA9685_MAXCHAN;
pca->chip.dev = &client->dev;
pca->chip.base = -1;
--
2.17.1
next prev parent reply other threads:[~2020-02-26 13:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 13:52 [PATCH 1/4] pwm: pca9685: remove unused duty_cycle struct element Matthias Schiffer
2020-02-26 13:52 ` Matthias Schiffer [this message]
2020-03-30 13:07 ` [PATCH 2/4] pwm: pca9685: remove ALL_LED PWM channel Thierry Reding
2020-03-30 13:15 ` Thierry Reding
2020-03-30 13:19 ` Andy Shevchenko
2020-03-30 15:38 ` Thierry Reding
2020-03-30 13:34 ` Clemens Gruber
2020-03-30 15:40 ` Thierry Reding
2020-03-30 15:43 ` Thierry Reding
2020-03-30 16:07 ` Clemens Gruber
2020-03-31 12:09 ` (EXT) " Matthias Schiffer
2020-03-31 13:14 ` Clemens Gruber
2020-02-26 13:52 ` [PATCH 3/4] pwm: pca9685: initialize all LED registers during probe Matthias Schiffer
2020-02-26 15:00 ` Uwe Kleine-König
2020-02-26 16:13 ` (EXT) " Matthias Schiffer
2020-03-30 13:07 ` Thierry Reding
2020-02-26 13:52 ` [PATCH 4/4] pwm: pca9685: migrate config/enable/disable to apply Matthias Schiffer
2020-02-26 15:05 ` Uwe Kleine-König
2020-02-26 15:10 ` [PATCH 1/4] pwm: pca9685: remove unused duty_cycle struct element Uwe Kleine-König
2020-02-26 17:03 ` (EXT) " Matthias Schiffer
2020-02-26 19:21 ` Uwe Kleine-König
2020-02-28 13:26 ` (EXT) " Matthias Schiffer
2020-03-30 15:12 ` Clemens Gruber
2020-04-03 23:50 ` Sven Van Asbroeck
2020-04-04 17:35 ` Clemens Gruber
2020-04-04 20:17 ` Sven Van Asbroeck
2020-04-06 9:51 ` Thierry Reding
2020-04-07 13:00 ` (EXT) " Matthias Schiffer
2020-04-09 11:42 ` Sven Van Asbroeck
2020-04-03 23:47 ` Sven Van Asbroeck
2020-04-07 14:46 ` (EXT) " Matthias Schiffer
2020-04-08 8:00 ` Matthias Schiffer
2020-03-30 13:07 ` Thierry Reding
2020-03-30 13:18 ` Andy Shevchenko
2020-03-30 16:02 ` Thierry Reding
2020-03-30 16:10 ` Clemens Gruber
2020-04-01 16:36 ` Clemens Gruber
2020-04-01 17:45 ` Thierry Reding
2020-04-02 7:10 ` (EXT) " Matthias Schiffer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200226135229.24929-2-matthias.schiffer@ew.tq-group.com \
--to=matthias.schiffer@ew.tq-group.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).