From: lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
To: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
mark.rutland-5wv7dgnIgG8@public.gmane.org,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
wens-jdAy2FN1RRM@public.gmane.org,
linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Siarhei Volkau <lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v4 6/9] pwm: sunxi: Increase max number of pwm channels.
Date: Fri, 24 Feb 2017 08:41:13 +0300 [thread overview]
Message-ID: <1487914876-8594-7-git-send-email-lis8215@gmail.com> (raw)
In-Reply-To: <1487914876-8594-1-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Siarhei Volkau <lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
sun6i have 4 pwm channels onboard. This patch increase
maximal possible count of channels.
Signed-off-by: Siarhei Volkau <lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/pwm/pwm-sun4i.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
index 9463148..a179a53 100644
--- a/drivers/pwm/pwm-sun4i.c
+++ b/drivers/pwm/pwm-sun4i.c
@@ -46,7 +46,7 @@
#define BIT_CH(bit, chan) ((bit) << ((chan) * PWMCH_OFFSET))
-#define SUN4I_MAX_PWM_CHANNELS 2
+#define SUNXI_MAX_PWM_CHANNELS 4
/* regmap fields */
enum {
@@ -91,14 +91,14 @@ struct sun4i_pwm_data {
bool has_rdy;
unsigned int npwm;
const u32 *prescaler_table;
- const struct sunxi_pwmch_data *chan_data[SUN4I_MAX_PWM_CHANNELS];
+ const struct sunxi_pwmch_data *chan_data[SUNXI_MAX_PWM_CHANNELS];
};
struct sun4i_pwm_chip {
struct pwm_chip chip;
struct clk *clk;
struct regmap *regmap;
- struct regmap_field *fields[SUN4I_MAX_PWM_CHANNELS][NUM_FIELDS];
+ struct regmap_field *fields[SUNXI_MAX_PWM_CHANNELS][NUM_FIELDS];
spinlock_t ctrl_lock;
const struct sun4i_pwm_data *data;
};
@@ -426,7 +426,7 @@ static int sunxi_alloc_reg_fields(struct device *dev,
int i, err;
const struct sunxi_pwmch_data *data = pwm->data->chan_data[chan];
- if (!data || chan >= SUN4I_MAX_PWM_CHANNELS)
+ if (!data || chan >= SUNXI_MAX_PWM_CHANNELS)
return -EINVAL;
for (i = 0; i < NUM_FIELDS; i++) {
pwm->fields[chan][i] =
--
2.4.11
next prev parent reply other threads:[~2017-02-24 5:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 5:41 [PATCH v4 0/9] Add the Allwinner A31/A31s PWM driver lis8215-Re5JQEeQqe8AvxtiuMwx3w
2017-02-24 5:41 ` [PATCH v4 1/9] pwm: sunxi: Use regmap API for register access lis8215
[not found] ` <1487914876-8594-2-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-27 9:17 ` Maxime Ripard
2017-02-27 11:22 ` Siarhei Volkau
[not found] ` <CAKNVLfYLfiTKu1CWcR5JiYepgfy-AO4CZ6ZKLaijmj+rmpxWAg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-02-28 15:53 ` Maxime Ripard
[not found] ` <1487914876-8594-1-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-24 5:41 ` [PATCH v4 2/9] pwm: sunxi: Use regmap fields for bit operations lis8215-Re5JQEeQqe8AvxtiuMwx3w
[not found] ` <1487914876-8594-3-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-27 9:28 ` Maxime Ripard
2017-02-27 11:41 ` Siarhei Volkau
[not found] ` <CAKNVLfYVfMDDeBB0cOb-_d5EytCWG8DDssnUH573_yOfJdJ8uA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-02-28 15:56 ` Maxime Ripard
2017-02-24 5:41 ` [PATCH v4 4/9] pwm: sunxi: Customizable control and period register position lis8215-Re5JQEeQqe8AvxtiuMwx3w
[not found] ` <1487914876-8594-5-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-27 9:30 ` Maxime Ripard
2017-02-27 12:35 ` Siarhei Volkau
[not found] ` <CAKNVLfa6NgRBSVZgOb5yp31Eq8nZYRSKQzgUzoXL5_QFfYVjeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-02-28 15:48 ` Maxime Ripard
2017-02-24 5:41 ` [PATCH v4 5/9] pwm: sunxi: Customizable regmap fields and enable bit mask lis8215-Re5JQEeQqe8AvxtiuMwx3w
2017-02-24 5:41 ` lis8215-Re5JQEeQqe8AvxtiuMwx3w [this message]
2017-02-24 5:41 ` [PATCH v4 7/9] pwm: sunxi: Add support the Allwinner A31 PWM lis8215-Re5JQEeQqe8AvxtiuMwx3w
2017-02-24 5:41 ` [PATCH v4 9/9] ARM: dts: sun6i: Add the PWM block to the A31/A31s lis8215-Re5JQEeQqe8AvxtiuMwx3w
2017-02-24 5:41 ` [PATCH v4 3/9] pwm: sunxi: Selectable prescaler table lis8215
[not found] ` <1487914876-8594-4-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-27 9:28 ` Maxime Ripard
2017-02-24 5:41 ` [PATCH v4 8/9] pwm: sunxi: Code cleanup lis8215
[not found] ` <1487914876-8594-9-git-send-email-lis8215-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-27 9:32 ` Maxime Ripard
2017-02-27 13:21 ` Siarhei Volkau
2017-02-28 15:49 ` Maxime Ripard
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=1487914876-8594-7-git-send-email-lis8215@gmail.com \
--to=lis8215-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=wens-jdAy2FN1RRM@public.gmane.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;
as well as URLs for NNTP newsgroup(s).