riscv: pwm: sophgo: add pwm support for SG2044
Subsystems (4)
v5 cover riscv: pwm: sophgo: add pwm support for SG2044
This patch adds PWM controller support for four independent PWM channel outputs.
---
Changes in v5:
- Rename function and variables for clarity.
- Modify code style.
Changes in v4:
You can simply review or test the patches at the link [4].
- add tags for mail.
Changes in v3:
You can simply review or test the patches at the link [3].
- Rename macro definitions to unify naming.
- Modify code style.
Changes in v2:
You can simply review or test the patches at the link [2].
- Modify variable naming and code logic.
- update "MODULE_AUTHOR".
Changes in v1:
You can simply review or test the patches at the link [1].
---
Longbin Li (3):
pwm: sophgo: reorganize the code structure
pwm: sophgo: add driver for SG2044
dt-bindings: pwm: sophgo: add pwm controller for SG2044
.../bindings/pwm/sophgo,sg2042-pwm.yaml | 4 +- drivers/pwm/pwm-sophgo-sg2042.c | 141 +++++++++++++++--- 2 files changed, 127 insertions(+), 18 deletions(-)
--
2.49.0
PATCH v5 1/3 dt-bindings: pwm: sophgo: add pwm controller for SG2044
Add compatible string for PWM controller on SG2044.
--- Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml +3 -1
@@ -17,7 +17,9 @@ allOf: properties: compatible: - const: sophgo,sg2042-pwm + enum: + - sophgo,sg2042-pwm + - sophgo,sg2044-pwm reg: maxItems: 1
--
2.49.0
PATCH v5 2/3 pwm: sophgo: reorganize the code structure
In reply to Longbin LiAs the driver logic can be used in both SG2042 and SG2044, it will be better to reorganize the code structure.
--- drivers/pwm/pwm-sophgo-sg2042.c | 52 +++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 15 deletions(-)
drivers/pwm/pwm-sophgo-sg2042.c +37 -15
@@ -53,6 +53,10 @@ struct sg2042_pwm_ddata {unsigned long clk_rate_hz; }; +struct sg2042_chip_data { +const struct pwm_ops ops; +}; +/* * period_ticks: PERIOD * hlperiod_ticks: HLPERIOD
@@ -66,21 +70,13 @@ static void pwm_sg2042_config(struct sg2042_pwm_ddata *ddata, unsigned int chan,writel (hlperiod_ticks, base +SG2042_PWM_HLPERIOD (chan)); } -static int pwm_sg2042_apply (struct pwm_chip *chip,struct pwm_device *pwm, -const struct pwm_state *state) +static void pwm_sg2042_set_dutycycle (struct pwm_chip *chip,struct pwm_device *pwm, +const struct pwm_state *state) {struct sg2042_pwm_ddata *ddata =pwmchip_get_drvdata (chip);u32 hlperiod_ticks;u32 period_ticks; -if (state->polarity ==PWM_POLARITY_INVERSED ) -return -EINVAL ; - -if (!state->enabled) { -pwm_sg2042_config (ddata, pwm->hwpwm,0 ,0 ); -return 0 ; - } -/* * Duration of High level (duty_cycle) = HLPERIOD x Period_of_input_clk * Duration of One Cycle (period) = PERIOD x Period_of_input_clk
@@ -92,6 +88,22 @@ static int pwm_sg2042_apply(struct pwm_chip *chip, struct pwm_device *pwm, pwm->hwpwm, period_ticks, hlperiod_ticks);pwm_sg2042_config (ddata, pwm->hwpwm, period_ticks, hlperiod_ticks); +} + +static int pwm_sg2042_apply (struct pwm_chip *chip,struct pwm_device *pwm, +const struct pwm_state *state) +{ +struct sg2042_pwm_ddata *ddata =pwmchip_get_drvdata (chip); + +if (state->polarity ==PWM_POLARITY_INVERSED ) +return -EINVAL ; + +if (!state->enabled) { +pwm_sg2042_config (ddata, pwm->hwpwm,0 ,0 ); +return 0 ; + } + +pwm_sg2042_set_dutycycle (chip, pwm, state);return 0 ; }
@@ -123,13 +135,18 @@ static int pwm_sg2042_get_state(struct pwm_chip *chip, struct pwm_device *pwm,return 0 ; } -static const struct pwm_ops pwm_sg2042_ops = { - .apply = pwm_sg2042_apply, - .get_state = pwm_sg2042_get_state, +static const struct sg2042_chip_data sg2042_chip_data = { + .ops = { + .apply = pwm_sg2042_apply, + .get_state = pwm_sg2042_get_state, + } };static const struct of_device_id sg2042_pwm_ids[] = { - { .compatible ="sophgo,sg2042-pwm" }, + { + .compatible ="sophgo,sg2042-pwm" , + .data = &sg2042_chip_data + }, { } };MODULE_DEVICE_TABLE (of, sg2042_pwm_ids);
@@ -137,12 +154,17 @@ MODULE_DEVICE_TABLE(of, sg2042_pwm_ids);static int pwm_sg2042_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; +const struct sg2042_chip_data *chip_data;struct sg2042_pwm_ddata *ddata;struct reset_control *rst;struct pwm_chip *chip;struct clk *clk;int ret; + chip_data =device_get_match_data (dev); +if (!chip_data) +return -ENODEV ; + chip =devm_pwmchip_alloc (dev,SG2042_PWM_CHANNELNUM ,sizeof (*ddata));if (IS_ERR (chip))return PTR_ERR (chip);
@@ -170,7 +192,7 @@ static int pwm_sg2042_probe(struct platform_device *pdev)if (IS_ERR (rst))return dev_err_probe (dev,PTR_ERR (rst),"Failed to get reset\n" ); - chip->ops = &pwm_sg2042_ops; + chip->ops = &chip_data->ops; chip->atomic = true; ret =devm_pwmchip_add (dev, chip);
--
2.49.0
PATCH v5 3/3 pwm: sophgo: add driver for SG2044
In reply to Longbin LiAdd PWM controller for SG2044 on base of SG2042.
--- drivers/pwm/pwm-sophgo-sg2042.c | 89 ++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-)
drivers/pwm/pwm-sophgo-sg2042.c +87 -2
@@ -13,6 +13,7 @@* the running period. * - When PERIOD and HLPERIOD is set to 0, the PWM wave output will * be stopped and the output is pulled to high. +* - SG2044 supports both polarities, SG2042 only normal polarity. * See the datasheet [1] for more details. * [1]:https://github.com/sophgo/sophgo-doc/tree/main/SG2042/TRM */
@@ -41,6 +42,10 @@#define SG2042_PWM_HLPERIOD (chan) ((chan) * 8 + 0)#define SG2042_PWM_PERIOD (chan) ((chan) * 8 + 4) +#define SG2044_PWM_POLARITY 0x40 +#define SG2044_PWM_PWMSTART 0x44 +#define SG2044_PWM_OE 0xd0 +#define SG2042_PWM_CHANNELNUM 4/**
@@ -84,8 +89,8 @@ static void pwm_sg2042_set_dutycycle(struct pwm_chip *chip, struct pwm_device *p period_ticks =min (mul_u64_u64_div_u64 (ddata->clk_rate_hz, state->period,NSEC_PER_SEC ),U32_MAX ); hlperiod_ticks =min (mul_u64_u64_div_u64 (ddata->clk_rate_hz, state->duty_cycle,NSEC_PER_SEC ),U32_MAX ); -dev_dbg (pwmchip_parent (chip),"chan[%u]: PERIOD=%u, HLPERIOD=%u\n" , - pwm->hwpwm, period_ticks, hlperiod_ticks); +dev_dbg (pwmchip_parent (chip),"chan[%u]: ENABLE=%u, PERIOD=%u, HLPERIOD=%u, POLARITY=%u\n" , + pwm->hwpwm, state->enabled, period_ticks, hlperiod_ticks, state->polarity);pwm_sg2042_config (ddata, pwm->hwpwm, period_ticks, hlperiod_ticks); }
@@ -135,6 +140,74 @@ static int pwm_sg2042_get_state(struct pwm_chip *chip, struct pwm_device *pwm,return 0 ; } +static void pwm_sg2044_set_outputen (struct sg2042_pwm_ddata *ddata,struct pwm_device *pwm, +bool enabled) +{ +u32 pwmstart; + + pwmstart =readl (ddata->base +SG2044_PWM_PWMSTART ); + +if (enabled) + pwmstart |=BIT (pwm->hwpwm); +else + pwmstart &= ~BIT (pwm->hwpwm); + +writel (pwmstart, ddata->base +SG2044_PWM_PWMSTART ); +} + +static void pwm_sg2044_set_outputdir (struct sg2042_pwm_ddata *ddata,struct pwm_device *pwm, +bool enabled) +{ +u32 pwm_oe; + + pwm_oe =readl (ddata->base +SG2044_PWM_OE ); + +if (enabled) + pwm_oe |=BIT (pwm->hwpwm); +else + pwm_oe &= ~BIT (pwm->hwpwm); + +writel (pwm_oe, ddata->base +SG2044_PWM_OE ); +} + +static void pwm_sg2044_set_polarity (struct sg2042_pwm_ddata *ddata,struct pwm_device *pwm, +const struct pwm_state *state) +{ +u32 pwm_polarity; + + pwm_polarity =readl (ddata->base +SG2044_PWM_POLARITY ); + +if (state->polarity ==PWM_POLARITY_NORMAL ) + pwm_polarity &= ~BIT (pwm->hwpwm); +else + pwm_polarity |=BIT (pwm->hwpwm); + +writel (pwm_polarity, ddata->base +SG2044_PWM_POLARITY ); +} + +static int pwm_sg2044_apply (struct pwm_chip *chip,struct pwm_device *pwm, +const struct pwm_state *state) +{ +struct sg2042_pwm_ddata *ddata =pwmchip_get_drvdata (chip); + +pwm_sg2044_set_polarity (ddata, pwm, state); + +pwm_sg2042_set_dutycycle (chip, pwm, state); + +/* +* re-enable PWMSTART to refresh the register period +*/ +pwm_sg2044_set_outputen (ddata, pwm, false); + +if (!state->enabled) +return 0 ; + +pwm_sg2044_set_outputdir (ddata, pwm, true); +pwm_sg2044_set_outputen (ddata, pwm, true); + +return 0 ; +} +static const struct sg2042_chip_data sg2042_chip_data = { .ops = { .apply = pwm_sg2042_apply,
@@ -142,11 +215,22 @@ static const struct sg2042_chip_data sg2042_chip_data = { } }; +static const struct sg2042_chip_data sg2044_chip_data = { + .ops = { + .apply = pwm_sg2044_apply, + .get_state = pwm_sg2042_get_state, + } +}; +static const struct of_device_id sg2042_pwm_ids[] = { { .compatible ="sophgo,sg2042-pwm" , .data = &sg2042_chip_data }, + { + .compatible ="sophgo,sg2044-pwm" , + .data = &sg2044_chip_data + }, { } };MODULE_DEVICE_TABLE (of, sg2042_pwm_ids);
@@ -212,5 +296,6 @@ static struct platform_driver pwm_sg2042_driver = {module_platform_driver (pwm_sg2042_driver);MODULE_AUTHOR ("Chen Wang" ); +MODULE_AUTHOR ("Longbin Li <[email protected]>" );MODULE_DESCRIPTION ("Sophgo SG2042 PWM driver" );MODULE_LICENSE ("GPL" );
--
2.49.0
Quoted 41 lines · Longbin Li
This patch adds PWM controller support for four independent PWM channel outputs.
---
Changes in v5:
- Rename function and variables for clarity.
- Modify code style.Changes in v4:
You can simply review or test the patches at the link [4].- add tags for mail.
Changes in v3:
You can simply review or test the patches at the link [3].- Rename macro definitions to unify naming.
- Modify code style.Changes in v2:
You can simply review or test the patches at the link [2].- Modify variable naming and code logic.
- update "MODULE_AUTHOR".Changes in v1:
You can simply review or test the patches at the link [1].---
Longbin Li (3):
pwm: sophgo: reorganize the code structure
pwm: sophgo: add driver for SG2044
dt-bindings: pwm: sophgo: add pwm controller for SG2044
Quoted 6 lines
.../bindings/pwm/sophgo,sg2042-pwm.yaml | 4 +- drivers/pwm/pwm-sophgo-sg2042.c | 141 +++++++++++++++--- 2 files changed, 127 insertions(+), 18 deletions(-)--
2.49.0
No major changes, LGTM.
Chen
Uwe Kleine-König
maintainerRe: [PATCH v5 3/3] pwm: sophgo: add driver for SG2044
In reply to Longbin LiHello,
Quoted 5 lines · Longbin Li
Add PWM controller for SG2044 on base of SG2042.
Signed-off-by Longbin Li <[email protected]>Reviewed-by Chen Wang <[email protected]>Tested-by Chen Wang <[email protected]>
Nitpick: Make your S-o-b line the last line. This way you document that it was you who added the tags for Chen Wang.
Quoted 4 lines
[...]
drivers/pwm/pwm-sophgo-sg2042.c +3
-0+static int pwm_sg2044_apply (struct pwm_chip *chip,struct pwm_device *pwm, +const struct pwm_state *state) +{
drivers/pwm/pwm-sophgo-sg2042.c static int pwm_sg2042_get_state(struct pwm_chip *chip, struct pwm_device *pwm, · line 200
Quoted 10 lines
drivers/pwm/pwm-sophgo-sg2042.c +10
-0+struct sg2042_pwm_ddata *ddata =pwmchip_get_drvdata (chip); + +pwm_sg2044_set_polarity (ddata, pwm, state); + +pwm_sg2042_set_dutycycle (chip, pwm, state); + +/* +* re-enable PWMSTART to refresh the register period +*/ +pwm_sg2044_set_outputen (ddata, pwm, false);
I'm astonished that checkpatch doesn't spot the wrong indention here.
Quoted 14 lines
drivers/pwm/pwm-sophgo-sg2042.c +10
-0+ +if (!state->enabled) +return 0 ; + +pwm_sg2044_set_outputdir (ddata, pwm, true); +pwm_sg2044_set_outputen (ddata, pwm, true); + +return 0 ; +} +static const struct sg2042_chip_data sg2042_chip_data = { .ops = { .apply = pwm_sg2042_apply,
drivers/pwm/pwm-sophgo-sg2042.c static const struct sg2042_chip_data sg2042_chip_data = { · line 222
Quoted 8 lines
drivers/pwm/pwm-sophgo-sg2042.c +5
-0@@ -142,11 +215,22 @@ static const struct sg2042_chip_data sg2042_chip_data = { } }; +static const struct sg2042_chip_data sg2044_chip_data = { + .ops = { + .apply = pwm_sg2044_apply, + .get_state = pwm_sg2042_get_state, + }
Missing , after }.
If you're ok, I'll pick up this version and fixup the two code changes and the order of the tags in the commit log.
Best regards
Uwe
Re: [PATCH v5 3/3] pwm: sophgo: add driver for SG2044
Quoted 12 lines · Uwe Kleine-König
Hello,
Quoted 5 lines · Longbin Li
Add PWM controller for SG2044 on base of SG2042.
Signed-off-by Longbin Li <[email protected]>Reviewed-by Chen Wang <[email protected]>Tested-by Chen Wang <[email protected]>Nitpick: Make your S-o-b line the last line. This way you document that it was you who added the tags for Chen Wang.
Thank for remind.
Quoted 8 lines
Quoted 8 lines
[...]
drivers/pwm/pwm-sophgo-sg2042.c +7
-0+static int pwm_sg2044_apply (struct pwm_chip *chip,struct pwm_device *pwm, +const struct pwm_state *state) +{ +struct sg2042_pwm_ddata *ddata =pwmchip_get_drvdata (chip); + +pwm_sg2044_set_polarity (ddata, pwm, state); +
Quoted 9 lines
drivers/pwm/pwm-sophgo-sg2042.c static int pwm_sg2042_get_state(struct pwm_chip *chip, struct pwm_device *pwm, · line 200
Quoted 6 lines
drivers/pwm/pwm-sophgo-sg2042.c +6
-0+pwm_sg2042_set_dutycycle (chip, pwm, state); + +/* +* re-enable PWMSTART to refresh the register period +*/ +pwm_sg2044_set_outputen (ddata, pwm, false);I'm astonished that checkpatch doesn't spot the wrong indention here.
I re-ran the checkpatch but no error. Maybe there is something wrong in checkpatch.
Quoted 25 lines
Quoted 14 lines
drivers/pwm/pwm-sophgo-sg2042.c +10
-0+ +if (!state->enabled) +return 0 ; + +pwm_sg2044_set_outputdir (ddata, pwm, true); +pwm_sg2044_set_outputen (ddata, pwm, true); + +return 0 ; +} +static const struct sg2042_chip_data sg2042_chip_data = { .ops = { .apply = pwm_sg2042_apply,drivers/pwm/pwm-sophgo-sg2042.c static const struct sg2042_chip_data sg2042_chip_data = { · line 222
Quoted 8 lines
drivers/pwm/pwm-sophgo-sg2042.c +5
-0@@ -142,11 +215,22 @@ static const struct sg2042_chip_data sg2042_chip_data = { } }; +static const struct sg2042_chip_data sg2044_chip_data = { + .ops = { + .apply = pwm_sg2044_apply, + .get_state = pwm_sg2042_get_state, + }Missing , after }.
Quoted 5 lines
If you're ok, I'll pick up this version and fixup the two code changes and the order of the tags in the commit log.
Best regards
Uwe
Thanks, it's ok to go.
Best regards,
Longbin
Uwe Kleine-König
maintainerRe: [PATCH v5 3/3] pwm: sophgo: add driver for SG2044
Hello,
Quoted 1 line · Longbin Li
Thanks, it's ok to go.
Great, pushed out to
https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/for-nexxt
as 6.17-rc1 material with the changes mentioned earlier. If you don't agree to a change I did there, please tell me.
Best regards
Uwe