From: Neil Armstrong <narmstrong@baylibre.com>
To: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-amlogic@lists.infradead.org, linux-pwm@vger.kernel.org,
thierry.reding@gmail.com, u.kleine-koenig@pengutronix.de
Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 05/14] pwm: meson: don't duplicate the polarity internally
Date: Mon, 27 May 2019 14:26:48 +0200 [thread overview]
Message-ID: <edb82eba-2576-f99a-5553-cec18ee292f1@baylibre.com> (raw)
In-Reply-To: <20190525181133.4875-6-martin.blumenstingl@googlemail.com>
On 25/05/2019 20:11, Martin Blumenstingl wrote:
> Let meson_pwm_calc() use the polarity from struct pwm_state directly.
> This removes a level of indirection where meson_pwm_apply() first had to
> set a driver-internal inverter mask which was then only used by
> meson_pwm_calc().
>
> Instead of adding the polarity as parameter to meson_pwm_calc() switch
> to struct pwm_state directly to make it easier to see where the
> parameters are actually coming from.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> ---
> drivers/pwm/pwm-meson.c | 23 ++++++++---------------
> 1 file changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
> index 84b28ba0f903..39ea119add7b 100644
> --- a/drivers/pwm/pwm-meson.c
> +++ b/drivers/pwm/pwm-meson.c
> @@ -63,7 +63,6 @@ struct meson_pwm {
> struct pwm_chip chip;
> const struct meson_pwm_data *data;
> void __iomem *base;
> - u8 inverter_mask;
> /*
> * Protects register (write) access to the REG_MISC_AB register
> * that is shared between the two PWMs.
> @@ -116,14 +115,17 @@ static void meson_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
> }
>
> static int meson_pwm_calc(struct meson_pwm *meson,
> - struct meson_pwm_channel *channel, unsigned int id,
> - unsigned int duty, unsigned int period)
> + struct meson_pwm_channel *channel,
> + struct pwm_state *state)
> {
> - unsigned int pre_div, cnt, duty_cnt;
> + unsigned int duty, period, pre_div, cnt, duty_cnt;
> unsigned long fin_freq = -1;
> u64 fin_ps;
>
> - if (~(meson->inverter_mask >> id) & 0x1)
> + duty = state->duty_cycle;
> + period = state->period;
> +
> + if (state->polarity == PWM_POLARITY_INVERSED)
> duty = period - duty;
>
> if (period == channel->state.period &&
> @@ -278,15 +280,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
> if (state->period != channel->state.period ||
> state->duty_cycle != channel->state.duty_cycle ||
> state->polarity != channel->state.polarity) {
> - if (state->polarity != channel->state.polarity) {
> - if (state->polarity == PWM_POLARITY_NORMAL)
> - meson->inverter_mask |= BIT(pwm->hwpwm);
> - else
> - meson->inverter_mask &= ~BIT(pwm->hwpwm);
> - }
> -
> - err = meson_pwm_calc(meson, channel, pwm->hwpwm,
> - state->duty_cycle, state->period);
> + err = meson_pwm_calc(meson, channel, state);
> if (err < 0)
> return err;
>
> @@ -520,7 +514,6 @@ static int meson_pwm_probe(struct platform_device *pdev)
> meson->chip.of_pwm_n_cells = 3;
>
> meson->data = of_device_get_match_data(&pdev->dev);
> - meson->inverter_mask = BIT(meson->chip.npwm) - 1;
>
> channels = devm_kcalloc(&pdev->dev, meson->chip.npwm,
> sizeof(*channels), GFP_KERNEL);
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2019-05-27 12:27 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 18:11 [PATCH 00/14] pwm-meson: cleanups and improvements Martin Blumenstingl
2019-05-25 18:11 ` [PATCH 01/14] pwm: meson: unify the parameter list of meson_pwm_{enable, disable} Martin Blumenstingl
2019-05-27 12:25 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 02/14] pwm: meson: use devm_clk_get_optional() to get the input clock Martin Blumenstingl
2019-05-27 12:25 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 03/14] pwm: meson: use GENMASK and FIELD_PREP for the lo and hi values Martin Blumenstingl
2019-05-27 12:25 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 04/14] pwm: meson: change MISC_CLK_SEL_WIDTH to MISC_CLK_SEL_MASK Martin Blumenstingl
2019-05-27 12:26 ` Neil Armstrong
2019-05-27 17:46 ` Martin Blumenstingl
2019-05-27 18:00 ` Uwe Kleine-König
2019-05-28 18:04 ` Martin Blumenstingl
2019-05-25 18:11 ` [PATCH 05/14] pwm: meson: don't duplicate the polarity internally Martin Blumenstingl
2019-05-27 12:26 ` Neil Armstrong [this message]
2019-05-25 18:11 ` [PATCH 06/14] pwm: meson: pass struct pwm_device to meson_pwm_calc() Martin Blumenstingl
2019-05-27 12:27 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 07/14] pwm: meson: add the meson_pwm_channel data to struct meson_pwm Martin Blumenstingl
2019-05-27 12:27 ` Neil Armstrong
2019-05-27 17:52 ` Martin Blumenstingl
2019-05-25 18:11 ` [PATCH 08/14] pwm: meson: add the per-channel register offsets and bits in a struct Martin Blumenstingl
2019-05-27 12:28 ` Neil Armstrong
2019-05-27 17:57 ` Martin Blumenstingl
2019-05-28 8:11 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 09/14] pwm: meson: move pwm_set_chip_data() to meson_pwm_request() Martin Blumenstingl
2019-05-27 12:30 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 10/14] pwm: meson: simplify the calculation of the pre-divider and count Martin Blumenstingl
2019-05-26 19:41 ` Uwe Kleine-König
2019-05-27 12:37 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 11/14] pwm: meson: read the full hardware state in meson_pwm_get_state() Martin Blumenstingl
2019-05-27 12:31 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 12/14] pwm: meson: don't cache struct pwm_state internally Martin Blumenstingl
2019-05-27 12:31 ` Neil Armstrong
2019-05-25 18:11 ` [PATCH 13/14] pwm: meson: add support PWM_POLARITY_INVERSED when disabling Martin Blumenstingl
2019-05-27 12:33 ` Neil Armstrong
2019-05-27 17:50 ` Martin Blumenstingl
2019-05-25 18:11 ` [PATCH 14/14] pwm: meson: add documentation to the driver Martin Blumenstingl
2019-05-27 12:33 ` Neil Armstrong
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=edb82eba-2576-f99a-5553-cec18ee292f1@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--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
all inboxes | Powered by JetHome®