From: George Stark <gnstark@salutedevices.com>
To: <ukleinek@kernel.org>, <neil.armstrong@linaro.org>,
<khilman@baylibre.com>, <jbrunet@baylibre.com>,
<martin.blumenstingl@googlemail.com>
Cc: <linux-pwm@vger.kernel.org>, <linux-amlogic@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <kernel@salutedevices.com>,
George Stark <gnstark@salutedevices.com>
Subject: [PATCH 2/2] pwm: meson: Fix computing counter register
Date: Wed, 25 Dec 2024 13:56:39 +0300 [thread overview]
Message-ID: <20241225105639.1787237-3-gnstark@salutedevices.com> (raw)
In-Reply-To: <20241225105639.1787237-1-gnstark@salutedevices.com>
High and low values in the counter register are incremented by 1
internally unless they a zero and constant bit is supported and set.
So decrement by 1 calculated high and low PWM periods before applying.
Signed-off-by: George Stark <gnstark@salutedevices.com>
---
drivers/pwm/pwm-meson.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 8c6bf3d49753..51839936ec89 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -214,6 +214,15 @@ static int meson_pwm_calc(struct pwm_chip *chip, struct pwm_device *pwm,
channel->hi = duty_cnt;
channel->lo = cnt - duty_cnt;
channel->constant = false;
+
+ /*
+ * hi and low reg values are incremented by 1 internally
+ * unless they are zero and constant bit is set
+ */
+ if (channel->hi)
+ channel->hi--;
+ if (channel->lo)
+ channel->lo--;
}
channel->rate = fin_freq;
@@ -342,6 +351,7 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
struct meson_pwm *meson = to_meson_pwm(chip);
struct meson_pwm_channel_data *channel_data;
unsigned long fin_freq;
+ bool const_enabled;
unsigned int hi, lo;
u32 value;
@@ -356,10 +366,16 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
else
state->polarity = PWM_POLARITY_NORMAL;
+ const_enabled = meson->data->has_constant &&
+ (value & channel_data->const_en_mask);
+
value = readl(meson->base + channel_data->reg_offset);
lo = FIELD_GET(PWM_LOW_MASK, value);
hi = FIELD_GET(PWM_HIGH_MASK, value);
+ lo += (const_enabled ? !!lo : 1);
+ hi += (const_enabled ? !!hi : 1);
+
state->period = meson_pwm_cnt_to_ns(fin_freq, lo + hi);
state->duty_cycle = meson_pwm_cnt_to_ns(fin_freq, hi);
--
2.25.1
prev parent reply other threads:[~2024-12-25 10:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-25 10:56 [PATCH 0/2] pwm: meson: fixes George Stark
2024-12-25 10:56 ` [PATCH 1/2] pwm: meson: Simplify meson_pwm_cnt_to_ns() George Stark
2024-12-25 10:56 ` George Stark [this message]
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=20241225105639.1787237-3-gnstark@salutedevices.com \
--to=gnstark@salutedevices.com \
--cc=jbrunet@baylibre.com \
--cc=kernel@salutedevices.com \
--cc=khilman@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=neil.armstrong@linaro.org \
--cc=ukleinek@kernel.org \
/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®