Add support for H6 PWM
Subsystems (3)
v4 cover Add support for H6 PWM
Hi,
This is a rework of Jernej's previous work[1] taking account all the previous remarks.
Bindings is still strict but probe in the driver are now optionnals.
If someone could confirm that the PWM is not broken, as my board doesn't output it.
I didn't add the acked-tags as there are big changes.
Thanks,
Clément
Jernej's cover:
Allwinner H6 SoC has PWM core which is basically the same as that found in A20, it's just depends on additional bus clock and reset line.
This series adds support for it and extends PWM driver functionality in a way that it's now possible to bypass whole core and output PWM source clock directly as a PWM signal. This functionality is needed by AC200 chip, which is bundled in same physical package as H6 SoC, to serve as a clock source of 24 MHz. AC200 clock input pin is bonded internally to the second PWM channel.
I would be grateful if anyone can test this patch series for any kind of regression on other SoCs.
[1]: https://patchwork.kernel.org/cover/11061737/
Changes in v4:
- item description in correct order and add a blank line
- use %pe for printing PTR_ERR
- don't print error when it's an EPROBE_DEFER
- change output clock bypass formula to match PWM policy
Changes in v3:
- Documentation update to allow one clock without name
- Change reset optional to shared
- If reset probe failed return an error
- Remove old clock probe
- Update bypass enabled formula
Changes in v2:
- Remove allOf in Documentation
- Add H6 example in Documentation
- Change clock name from "pwm" to "mod"
- Change reset quirk to optional probe
- Change bus_clock quirk to optional probe
- Add limitation comment about mod_clk_output
- Add quirk for mod_clk_output
- Change bypass formula
Clément Péron (1):
[DO NOT MERGE] arm64: allwinner: h6: enable Beelink GS1 PWM
Jernej Skrabec (6):
dt-bindings: pwm: allwinner: Add H6 PWM description
pwm: sun4i: Add an optional probe for reset line
pwm: sun4i: Add an optional probe for bus clock
pwm: sun4i: Add support to output source clock directly
pwm: sun4i: Add support for H6 PWM
arm64: dts: allwinner: h6: Add PWM node
.../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 48 +++++++ .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++ drivers/pwm/pwm-sun4i.c | 134 +++++++++++++++++- 4 files changed, 192 insertions(+), 4 deletions(-)
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-1-peron.clem%40gmail.com.
PATCH v4 1/7 dt-bindings: pwm: allwinner: Add H6 PWM description
From: Jernej Skrabec <[email protected]>
H6 PWM block is basically the same as A20 PWM, except that it also has bus clock and reset line which needs to be handled accordingly.
Expand Allwinner PWM binding with H6 PWM specifics.
--- .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+)
Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +48 -0
@@ -30,13 +30,51 @@ properties: - items: - const: allwinner,sun50i-h5-pwm - const: allwinner,sun5i-a13-pwm + - const: allwinner,sun50i-h6-pwm reg: maxItems: 1 clocks: + minItems: 1 + maxItems: 2 + items: + - description: Module Clock + - description: Bus Clock + + # Even though it only applies to subschemas under the conditionals, + # not listing them here will trigger a warning because of the + # additionalsProperties set to false. + clock-names: true + + resets: maxItems: 1 + if: + properties: + compatible: + contains: + const: allwinner,sun50i-h6-pwm + + then: + properties: + clocks: + maxItems: 2 + + clock-names: + items: + - const: mod + - const: bus + + required: + - clock-names + - resets + + else: + properties: + clocks: + maxItems: 1 + required: - "#pwm-cells" - compatible
@@ -54,4 +92,14 @@ examples: #pwm-cells = <3>; }; + - | + pwm@300a000 { + compatible = "allwinner,sun50i-h6-pwm"; + reg = <0x0300a000 0x400>; + clocks = <&osc24M>, <&ccu CLK_BUS_PWM>; + clock-names = "mod", "bus"; + resets = <&ccu RST_BUS_PWM>; + #pwm-cells = <3>; + }; + ...
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-2-peron.clem%40gmail.com.
Re: [PATCH v4 1/7] dt-bindings: pwm: allwinner: Add H6 PWM description
Quoted 5 lines · On Fri, 8 Nov 2019 09:45:11 +0100, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= wrote:
From: Jernej Skrabec <[email protected]>
H6 PWM block is basically the same as A20 PWM, except that it also has bus clock and reset line which needs to be handled accordingly.
Quoted 8 lines
Expand Allwinner PWM binding with H6 PWM specifics.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>--- .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+)
PATCH v4 2/7 pwm: sun4i: Add an optional probe for reset line
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
H6 PWM core needs deasserted reset line in order to work.
Add an optional probe for it.
--- drivers/pwm/pwm-sun4i.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/pwm/pwm-sun4i.c +31 -2
@@ -16,6 +16,7 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pwm.h> +#include <linux/reset.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/time.h>
@@ -78,6 +79,7 @@ struct sun4i_pwm_data {struct sun4i_pwm_chip {struct pwm_chip chip;struct clk *clk; +struct reset_control *rst;void __iomem *base;spinlock_t ctrl_lock;const struct sun4i_pwm_data *data;
@@ -365,6 +367,21 @@ static int sun4i_pwm_probe(struct platform_device *pdev)if (IS_ERR (pwm->clk))return PTR_ERR (pwm->clk); + pwm->rst =devm_reset_control_get_optional_shared (&pdev->dev,NULL ); +if (IS_ERR (pwm->rst)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get reset failed %pe\n" , + pwm->rst); +return PTR_ERR (pwm->rst); + } + +/* Deassert reset */ + ret =reset_control_deassert (pwm->rst); +if (ret) { +dev_err (&pdev->dev,"Cannot deassert reset control\n" ); +return ret; + } + pwm->chip.dev = &pdev->dev; pwm->chip.ops = &sun4i_pwm_ops; pwm->chip.base =-1 ;
@@ -377,19 +394,31 @@ static int sun4i_pwm_probe(struct platform_device *pdev) ret =pwmchip_add (&pwm->chip);if (ret <0 ) {dev_err (&pdev->dev,"failed to add PWM chip: %d\n" , ret); -return ret; + goto err_pwm_add; }platform_set_drvdata (pdev, pwm);return 0 ; + +err_pwm_add: +reset_control_assert (pwm->rst); + +return ret; }static int sun4i_pwm_remove (struct platform_device *pdev) {struct sun4i_pwm_chip *pwm =platform_get_drvdata (pdev); +int ret; + + ret =pwmchip_remove (&pwm->chip); +if (ret) +return ret; + +reset_control_assert (pwm->rst); -return pwmchip_remove (&pwm->chip); +return 0 ; }static struct platform_driver sun4i_pwm_driver = {
Signature · 1 line
2.20.1
Re: [PATCH v4 2/7] pwm: sun4i: Add an optional probe for reset line
Quoted 8 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
H6 PWM core needs deasserted reset line in order to work.
Add an optional probe for it.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
PATCH v4 3/7 pwm: sun4i: Add an optional probe for bus clock
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
H6 PWM core needs bus clock to be enabled in order to work.
Add an optional probe for it and a fallback for previous bindings without name on module clock.
--- drivers/pwm/pwm-sun4i.c | 48 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-)
drivers/pwm/pwm-sun4i.c +46 -2
@@ -78,6 +78,7 @@ struct sun4i_pwm_data {struct sun4i_pwm_chip {struct pwm_chip chip; +struct clk *bus_clk;struct clk *clk;struct reset_control *rst;void __iomem *base;
@@ -363,9 +364,38 @@ static int sun4i_pwm_probe(struct platform_device *pdev)if (IS_ERR (pwm->base))return PTR_ERR (pwm->base); - pwm->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (pwm->clk)) +/* Get all clocks and reset line */ + pwm->clk =devm_clk_get_optional (&pdev->dev,"mod" ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk);return PTR_ERR (pwm->clk); + } + +/* +* Fallback for old dtbs with a single clock and no name. +* If a parent has a clock-name called "mod" whereas the +* current node is unnamed the clock reference will be +* incorrectly obtained and will not go into this fallback. +*/ +if (!pwm->clk) { + pwm->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk); +return PTR_ERR (pwm->clk); + } + } + + pwm->bus_clk =devm_clk_get_optional (&pdev->dev,"bus" ); +if (IS_ERR (pwm->bus_clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get bus_clock failed %pe\n" , + pwm->bus_clk); +return PTR_ERR (pwm->bus_clk); + } pwm->rst =devm_reset_control_get_optional_shared (&pdev->dev,NULL );if (IS_ERR (pwm->rst)) {
@@ -382,6 +412,17 @@ static int sun4i_pwm_probe(struct platform_device *pdev)return ret; } +/* +* We're keeping the bus clock on for the sake of simplicity. +* Actually it only needs to be on for hardware register +* accesses. +*/ + ret =clk_prepare_enable (pwm->bus_clk); +if (ret) { +dev_err (&pdev->dev,"Cannot prepare and enable bus_clk\n" ); + goto err_bus; + } + pwm->chip.dev = &pdev->dev; pwm->chip.ops = &sun4i_pwm_ops; pwm->chip.base =-1 ;
@@ -402,6 +443,8 @@ static int sun4i_pwm_probe(struct platform_device *pdev)return 0 ; err_pwm_add: +clk_disable_unprepare (pwm->bus_clk); +err_bus:reset_control_assert (pwm->rst);return ret;
@@ -416,6 +459,7 @@ static int sun4i_pwm_remove(struct platform_device *pdev)if (ret)return ret; +clk_disable_unprepare (pwm->bus_clk);reset_control_assert (pwm->rst);return 0 ;
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-4-peron.clem%40gmail.com.
Re: [PATCH v4 3/7] pwm: sun4i: Add an optional probe for bus clock
Quoted 35 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
H6 PWM core needs bus clock to be enabled in order to work.
Add an optional probe for it and a fallback for previous bindings without name on module clock.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>--- drivers/pwm/pwm-sun4i.c | 48 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-)drivers/pwm/pwm-sun4i.c +5
-2@@ -78,6 +78,7 @@ struct sun4i_pwm_data {struct sun4i_pwm_chip {struct pwm_chip chip; +struct clk *bus_clk;struct clk *clk;struct reset_control *rst;void __iomem *base;@@ -363,9 +364,38 @@ static int sun4i_pwm_probe(struct platform_device *pdev)if (IS_ERR (pwm->base))return PTR_ERR (pwm->base); - pwm->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (pwm->clk)) +/* Get all clocks and reset line */ + pwm->clk =devm_clk_get_optional (&pdev->dev,"mod" ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER )
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_probe(struct platform_device *pdev) · line 380
Quoted 10 lines
drivers/pwm/pwm-sun4i.c +9
-0+dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk);return PTR_ERR (pwm->clk); + } + +/* +* Fallback for old dtbs with a single clock and no name. +* If a parent has a clock-name called "mod" whereas the +* current node is unnamed the clock reference will be +* incorrectly obtained and will not go into this fallback.
For me "old dtbs" suggests that today a device tree should have a "mod" clock. Is this true also for machines other than H6? And I'd put the comment before the acquisition of the "mod" clock. Something like:
/*
* A clock called "mod" is only required on H6 (for now) and on
* other SoCs we expect an unnamed clock. So we request "mod"
* first (and ignore the corner case that a parent provides a
* "mod" clock) and if this is not found we fall back to the
* first clock of the PWM.
*/
Quoted 26 lines
drivers/pwm/pwm-sun4i.c +19
-0+*/ +if (!pwm->clk) { + pwm->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk); +return PTR_ERR (pwm->clk); + } + } + + pwm->bus_clk =devm_clk_get_optional (&pdev->dev,"bus" ); +if (IS_ERR (pwm->bus_clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get bus_clock failed %pe\n" , + pwm->bus_clk); +return PTR_ERR (pwm->bus_clk); + } pwm->rst =devm_reset_control_get_optional_shared (&pdev->dev,NULL );if (IS_ERR (pwm->rst)) {@@ -382,6 +412,17 @@ static int sun4i_pwm_probe(struct platform_device *pdev)return ret; } +/*
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_probe(struct platform_device *pdev) · line 425
Quoted 10 lines
drivers/pwm/pwm-sun4i.c +10
-0+* We're keeping the bus clock on for the sake of simplicity. +* Actually it only needs to be on for hardware register +* accesses. +*/ + ret =clk_prepare_enable (pwm->bus_clk); +if (ret) { +dev_err (&pdev->dev,"Cannot prepare and enable bus_clk\n" ); + goto err_bus; + } +
Would it make sense to split this patch into "Prefer "mod" clock to (unnamed) clock" and "Introduce optional bus clock"?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Re: [PATCH v4 3/7] pwm: sun4i: Add an optional probe for bus clock
Hi Uwe,
Quoted 43 lines · Uwe Kleine-König
Quoted 41 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
H6 PWM core needs bus clock to be enabled in order to work.
Add an optional probe for it and a fallback for previous bindings without name on module clock.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>--- drivers/pwm/pwm-sun4i.c | 48 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-)drivers/pwm/pwm-sun4i.c +10
-2@@ -78,6 +78,7 @@ struct sun4i_pwm_data {struct sun4i_pwm_chip {struct pwm_chip chip; +struct clk *bus_clk;struct clk *clk;struct reset_control *rst;void __iomem *base;@@ -363,9 +364,38 @@ static int sun4i_pwm_probe(struct platform_device *pdev)if (IS_ERR (pwm->base))return PTR_ERR (pwm->base); - pwm->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (pwm->clk)) +/* Get all clocks and reset line */ + pwm->clk =devm_clk_get_optional (&pdev->dev,"mod" ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk);return PTR_ERR (pwm->clk); + } + +/*
Quoted 8 lines
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_probe(struct platform_device *pdev) · line 380
Quoted 4 lines
drivers/pwm/pwm-sun4i.c +4
-0+* Fallback for old dtbs with a single clock and no name. +* If a parent has a clock-name called "mod" whereas the +* current node is unnamed the clock reference will be +* incorrectly obtained and will not go into this fallback. For me "old dtbs" suggests that today a device tree should have a "mod" clock. Is this true also for machines other than H6? And I'd put the comment before the acquisition of the "mod" clock. Something like:
Agree to remove the "old dtbs" but specifying the SoC instead of the reason is less clear for me.
I would prefer to have something like this:
A clock is explicitly called "mod" when several clocks are referenced. However, when only one clock is declared this one is unamed. So we request "mod" first (and ignore the corner case that a parent provides a "mod" clock)
and if this is not found we fall back to the first clock of the PWM.
What do you think?
Quoted 34 lines
/*
* A clock called "mod" is only required on H6 (for now) and on
* other SoCs we expect an unnamed clock. So we request "mod"
* first (and ignore the corner case that a parent provides a
* "mod" clock) and if this is not found we fall back to the
* first clock of the PWM.
*/Quoted 25 lines
drivers/pwm/pwm-sun4i.c +18
-0+*/ +if (!pwm->clk) { + pwm->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (pwm->clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get clock failed %pe\n" , + pwm->clk); +return PTR_ERR (pwm->clk); + } + } + + pwm->bus_clk =devm_clk_get_optional (&pdev->dev,"bus" ); +if (IS_ERR (pwm->bus_clk)) { +if (PTR_ERR (pwm->rst) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"get bus_clock failed %pe\n" , + pwm->bus_clk); +return PTR_ERR (pwm->bus_clk); + } pwm->rst =devm_reset_control_get_optional_shared (&pdev->dev,NULL );if (IS_ERR (pwm->rst)) {@@ -382,6 +412,17 @@ static int sun4i_pwm_probe(struct platform_device *pdev)return ret; }
Quoted 14 lines
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_probe(struct platform_device *pdev) · line 425
Quoted 11 lines
drivers/pwm/pwm-sun4i.c +11
-0+/* +* We're keeping the bus clock on for the sake of simplicity. +* Actually it only needs to be on for hardware register +* accesses. +*/ + ret =clk_prepare_enable (pwm->bus_clk); +if (ret) { +dev_err (&pdev->dev,"Cannot prepare and enable bus_clk\n" ); + goto err_bus; + } +Would it make sense to split this patch into "Prefer "mod" clock to (unnamed) clock" and "Introduce optional bus clock"?
Yes I will do in v5,
Regards,
Clément
Quoted 7 lines
Best regards
Uwe--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/CAJiuCccqyPbxRLjv1NRy6eukMnma8OUJGKvVHHDSKwybNJgKrg%40mail.gmail.com.
Re: [PATCH v4 3/7] pwm: sun4i: Add an optional probe for bus clock
Hello Clément,
Quoted 16 lines · Clément Péron
Quoted 10 lines · Uwe Kleine-König
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_probe(struct platform_device *pdev) · line 380
Quoted 5 lines · Clément Péron
drivers/pwm/pwm-sun4i.c +5
-0+/* +* Fallback for old dtbs with a single clock and no name. +* If a parent has a clock-name called "mod" whereas the +* current node is unnamed the clock reference will be +* incorrectly obtained and will not go into this fallback. For me "old dtbs" suggests that today a device tree should have a "mod" clock. Is this true also for machines other than H6? And I'd put the comment before the acquisition of the "mod" clock. Something like:
Agree to remove the "old dtbs" but specifying the SoC instead of the reason is less clear for me.
Quoted 7 lines
I would prefer to have something like this:
A clock is explicitly called "mod" when several clocks are referenced. However, when only one clock is declared this one is unamed. So we request "mod" first (and ignore the corner case that a parent provides a "mod" clock)
and if this is not found we fall back to the first clock of the PWM.
It gets better. What about also describing shortly the purpose of this clock (assuming this is the source clock of the PWM that is then divided):
All hardware variants need a source clock that is divided and then feeds the counter that defines the output wave form. In the device tree this clock is either unnamed or called "mod". Some variants (e.g. H6) need another clock to access the hardware registers; this is called "bus".
So we request "mod" first (and ignore the corner case that a parent provides a "mod" clock while the right one would be the unnamed one of the PWM device) and if this is not found we fall back to the first clock of the PWM.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
PATCH v4 4/7 pwm: sun4i: Add support to output source clock directly
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
PWM core has an option to bypass whole logic and output unchanged source clock as PWM output. This is achieved by enabling bypass bit.
Note that when bypass is enabled, no other setting has any meaning, not even enable bit.
This mode of operation is needed to achieve high enough frequency to serve as clock source for AC200 chip which is integrated into same package as H6 SoC.
--- drivers/pwm/pwm-sun4i.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/pwm/pwm-sun4i.c +44 -0
@@ -3,6 +3,10 @@* Driver for Allwinner sun4i Pulse Width Modulation Controller * * Copyright (C) 2014 Alexandre Belloni <[email protected]> +* +* Limitations: +* - When outputing the source clock directly, the PWM logic will be bypassed +* and the currently running period is not guaranteed to be completed */ #include <linux/bitops.h>
@@ -73,6 +77,7 @@ static const u32 prescaler_table[] = {struct sun4i_pwm_data {bool has_prescaler_bypass; +bool has_direct_mod_clk_output;unsigned int npwm; };
@@ -118,6 +123,20 @@ static void sun4i_pwm_get_state(struct pwm_chip *chip, val =sun4i_pwm_readl (sun4i_pwm,PWM_CTRL_REG ); +/* +* PWM chapter in H6 manual has a diagram which explains that if bypass +* bit is set, no other setting has any meaning. Even more, experiment +* proved that also enable bit is ignored in this case. +*/ +if ((val &BIT_CH (PWM_BYPASS , pwm->hwpwm)) && + sun4i_pwm->data->has_direct_mod_clk_output) { + state->period =DIV_ROUND_UP_ULL (NSEC_PER_SEC , clk_rate); + state->duty_cycle =DIV_ROUND_UP_ULL (state->period,2 ); + state->polarity =PWM_POLARITY_NORMAL ; + state->enabled = true; +return ; + } +if ((PWM_REG_PRESCAL (val, pwm->hwpwm) ==PWM_PRESCAL_MASK ) && sun4i_pwm->data->has_prescaler_bypass) prescaler =1 ;
@@ -204,6 +223,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,struct sun4i_pwm_chip *sun4i_pwm =to_sun4i_pwm_chip (chip);struct pwm_state cstate;u32 ctrl; +bool bypass = false;int ret;unsigned int delay_us;unsigned long now;
@@ -218,9 +238,24 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, } } +/* +* Although it would make much more sense to check for bypass in +* sun4i_pwm_calculate(), value of bypass bit also depends on "enabled". +*/ +if (state->enabled) { +u32 clk_rate =clk_get_rate (sun4i_pwm->clk); + bypass = (state->period * clk_rate >=NSEC_PER_SEC ) && + (state->period * clk_rate <2 *NSEC_PER_SEC ) && + (state->duty_cycle * clk_rate *2 >=NSEC_PER_SEC ); + } +spin_lock (&sun4i_pwm->ctrl_lock); ctrl =sun4i_pwm_readl (sun4i_pwm,PWM_CTRL_REG ); +/* We can skip calculation and apply parameters */ +if (bypass && sun4i_pwm->data->has_direct_mod_clk_output) + goto bypass_mode; +if ((cstate.period != state->period) || (cstate.duty_cycle != state->duty_cycle)) {u32 period, duty, val;
@@ -258,6 +293,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ctrl |=BIT_CH (PWM_ACT_STATE , pwm->hwpwm); ctrl |=BIT_CH (PWM_CLK_GATING , pwm->hwpwm); +if (state->enabled) { ctrl |=BIT_CH (PWM_EN , pwm->hwpwm); }else if (!sun4i_pwm->needs_delay[pwm->hwpwm]) {
@@ -265,6 +301,14 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ctrl &= ~BIT_CH (PWM_CLK_GATING , pwm->hwpwm); } +bypass_mode: +if (sun4i_pwm->data->has_direct_mod_clk_output) { +if (bypass) + ctrl |=BIT_CH (PWM_BYPASS , pwm->hwpwm); +else + ctrl &= ~BIT_CH (PWM_BYPASS , pwm->hwpwm); + } +sun4i_pwm_writel (sun4i_pwm, ctrl,PWM_CTRL_REG );spin_unlock (&sun4i_pwm->ctrl_lock);
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-5-peron.clem%40gmail.com.
Re: [PATCH v4 4/7] pwm: sun4i: Add support to output source clock directly
Quoted 44 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
PWM core has an option to bypass whole logic and output unchanged source clock as PWM output. This is achieved by enabling bypass bit.
Note that when bypass is enabled, no other setting has any meaning, not even enable bit.
This mode of operation is needed to achieve high enough frequency to serve as clock source for AC200 chip which is integrated into same package as H6 SoC.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>--- drivers/pwm/pwm-sun4i.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)drivers/pwm/pwm-sun4i.c +5
-0@@ -3,6 +3,10 @@* Driver for Allwinner sun4i Pulse Width Modulation Controller * * Copyright (C) 2014 Alexandre Belloni <[email protected]> +* +* Limitations: +* - When outputing the source clock directly, the PWM logic will be bypassed +* and the currently running period is not guaranteed to be completed */ #include <linux/bitops.h> @@ -73,6 +77,7 @@ static const u32 prescaler_table[] = {struct sun4i_pwm_data {bool has_prescaler_bypass; +bool has_direct_mod_clk_output;unsigned int npwm; };@@ -118,6 +123,20 @@ static void sun4i_pwm_get_state(struct pwm_chip *chip, val =sun4i_pwm_readl (sun4i_pwm,PWM_CTRL_REG );
drivers/pwm/pwm-sun4i.c static void sun4i_pwm_get_state(struct pwm_chip *chip, · line 134
Quoted 10 lines
drivers/pwm/pwm-sun4i.c +9
-0+/* +* PWM chapter in H6 manual has a diagram which explains that if bypass +* bit is set, no other setting has any meaning. Even more, experiment +* proved that also enable bit is ignored in this case. +*/ +if ((val &BIT_CH (PWM_BYPASS , pwm->hwpwm)) && + sun4i_pwm->data->has_direct_mod_clk_output) { + state->period =DIV_ROUND_UP_ULL (NSEC_PER_SEC , clk_rate); + state->duty_cycle =DIV_ROUND_UP_ULL (state->period,2 );
I first thought you're losing precision here by reusing state->period here, but with a divisor of 2 everything is fine.
Quoted 17 lines
drivers/pwm/pwm-sun4i.c +6
-0+ state->polarity =PWM_POLARITY_NORMAL ; + state->enabled = true; +return ; + } +if ((PWM_REG_PRESCAL (val, pwm->hwpwm) ==PWM_PRESCAL_MASK ) && sun4i_pwm->data->has_prescaler_bypass) prescaler =1 ;@@ -204,6 +223,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,struct sun4i_pwm_chip *sun4i_pwm =to_sun4i_pwm_chip (chip);struct pwm_state cstate;u32 ctrl; +bool bypass = false;int ret;unsigned int delay_us;unsigned long now;
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, · line 243
Quoted 6 lines
drivers/pwm/pwm-sun4i.c +3
-0@@ -218,9 +238,24 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, } } +/* +* Although it would make much more sense to check for bypass in +* sun4i_pwm_calculate(), value of bypass bit also depends on "enabled".
I don't understand this reasoning. sun4i_pwm_calculate knows about .enabled and also sun4i_pwm->data->has_direct_mod_clk_output. Maybe just add a bool *bypass as parameter and move the logic there?
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, · line 251
Quoted 8 lines
drivers/pwm/pwm-sun4i.c +8
-0+*/ +if (state->enabled) { +u32 clk_rate =clk_get_rate (sun4i_pwm->clk); + bypass = (state->period * clk_rate >=NSEC_PER_SEC ) && + (state->period * clk_rate <2 *NSEC_PER_SEC ) && + (state->duty_cycle * clk_rate *2 >=NSEC_PER_SEC ); + } +
This looks right now.
Best regards
Uwe
Signature · 7 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191113085858.76rad3vpszknu4cp%40pengutronix.de.
Re: [PATCH v4 4/7] pwm: sun4i: Add support to output source clock directly
Hi Uwe,
Quoted 80 lines · Uwe Kleine-König
Quoted 44 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
PWM core has an option to bypass whole logic and output unchanged source clock as PWM output. This is achieved by enabling bypass bit.
Note that when bypass is enabled, no other setting has any meaning, not even enable bit.
This mode of operation is needed to achieve high enough frequency to serve as clock source for AC200 chip which is integrated into same package as H6 SoC.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>--- drivers/pwm/pwm-sun4i.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)drivers/pwm/pwm-sun4i.c +5
-0@@ -3,6 +3,10 @@* Driver for Allwinner sun4i Pulse Width Modulation Controller * * Copyright (C) 2014 Alexandre Belloni <[email protected]> +* +* Limitations: +* - When outputing the source clock directly, the PWM logic will be bypassed +* and the currently running period is not guaranteed to be completed */ #include <linux/bitops.h> @@ -73,6 +77,7 @@ static const u32 prescaler_table[] = {struct sun4i_pwm_data {bool has_prescaler_bypass; +bool has_direct_mod_clk_output;unsigned int npwm; };@@ -118,6 +123,20 @@ static void sun4i_pwm_get_state(struct pwm_chip *chip, val =sun4i_pwm_readl (sun4i_pwm,PWM_CTRL_REG );drivers/pwm/pwm-sun4i.c static void sun4i_pwm_get_state(struct pwm_chip *chip, · line 134
Quoted 10 lines
drivers/pwm/pwm-sun4i.c +9
-0+/* +* PWM chapter in H6 manual has a diagram which explains that if bypass +* bit is set, no other setting has any meaning. Even more, experiment +* proved that also enable bit is ignored in this case. +*/ +if ((val &BIT_CH (PWM_BYPASS , pwm->hwpwm)) && + sun4i_pwm->data->has_direct_mod_clk_output) { + state->period =DIV_ROUND_UP_ULL (NSEC_PER_SEC , clk_rate); + state->duty_cycle =DIV_ROUND_UP_ULL (state->period,2 );I first thought you're losing precision here by reusing
state->periodhere, but with a divisor of 2 everything is fine.Quoted 20 lines
drivers/pwm/pwm-sun4i.c +6
-0+ state->polarity =PWM_POLARITY_NORMAL ; + state->enabled = true; +return ; + } +if ((PWM_REG_PRESCAL (val, pwm->hwpwm) ==PWM_PRESCAL_MASK ) && sun4i_pwm->data->has_prescaler_bypass) prescaler =1 ;@@ -204,6 +223,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,struct sun4i_pwm_chip *sun4i_pwm =to_sun4i_pwm_chip (chip);struct pwm_state cstate;u32 ctrl; +bool bypass = false;int ret;unsigned int delay_us;unsigned long now;@@ -218,9 +238,24 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, } }
Quoted 7 lines
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, · line 243
Quoted 3 lines
drivers/pwm/pwm-sun4i.c +3
-0+/* +* Although it would make much more sense to check for bypass in +* sun4i_pwm_calculate(), value of bypass bit also depends on "enabled". I don't understand this reasoning.
sun4i_pwm_calculateknows about .enabled and alsosun4i_pwm->data->has_direct_mod_clk_output. Maybe just add a bool *bypass as parameter and move the logic there?
I asked myself the same question, however the sun4i_pwm_calculate is only called when period or duty_cycle is updated not when state is toggled between disabled / enabled.
Should we also call it when the state is switched to enabled ?
Regards,
Clément
Quoted 18 lines
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, · line 251
Quoted 9 lines
drivers/pwm/pwm-sun4i.c +8
-0+*/ +if (state->enabled) { +u32 clk_rate =clk_get_rate (sun4i_pwm->clk); + bypass = (state->period * clk_rate >=NSEC_PER_SEC ) && + (state->period * clk_rate <2 *NSEC_PER_SEC ) && + (state->duty_cycle * clk_rate *2 >=NSEC_PER_SEC ); + } +This looks right now.
Best regards
Uwe--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Signature · 3 lines
You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/CAJiuCceYg7WC%3DpeHYeC%3DeE-HOsKH_SdsKyWwkWY5VpeY%2BuzaKA%40mail.gmail.com.
Re: [PATCH v4 4/7] pwm: sun4i: Add support to output source clock directly
Hello Clément,
Quoted 12 lines · Clément Péron
Quoted 9 lines · Uwe Kleine-König
drivers/pwm/pwm-sun4i.c static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, · line 243
Quoted 4 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
drivers/pwm/pwm-sun4i.c +3
-0+/* +* Although it would make much more sense to check for bypass in +* sun4i_pwm_calculate(), value of bypass bit also depends on "enabled". I don't understand this reasoning.
sun4i_pwm_calculateknows about .enabled and alsosun4i_pwm->data->has_direct_mod_clk_output. Maybe just add a bool *bypass as parameter and move the logic there?
Quoted 5 lines
I asked myself the same question, however the
sun4i_pwm_calculateis only called when period orduty_cycleis updated not when state is toggled between disabled / enabled.Should we also call it when the state is switched to enabled ?
Given that the check
if ((cstate.period != state->period) ||
(cstate.duty_cycle != state->duty_cycle)) {is not perfect anyhow (because if I toggle between
pwm_apply_state(pwm, { .period = 50000001, .duty_cycle = 25000000, .enabled = true });and
pwm_apply_state(pwm, { .period = 50000000, .duty_cycle = 25000000, .enabled = true });the code recalculates every parameter while it (probably) doesn't make a difference.) And also given that cstate is filled by pwm_get_state which might change its semantic slightly in the future I would say calculating the needed parameter always is also cleaner. (But I'm aware this isn't objective enough to overrule different opinions.) While I'm a fan of avoid unneeded calculations, I think having a simple driver is more important.
(And apart from that I don't like lowlevel drivers calling the pwm API that is designed for consumers.)
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
PATCH v4 5/7 pwm: sun4i: Add support for H6 PWM
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
Now that sun4i PWM driver supports deasserting reset line and enabling bus clock, support for H6 PWM can be added.
Note that while H6 PWM has two channels, only first one is wired to output pin. Second channel is used as a clock source to companion AC200 chip which is bundled into same package.
--- drivers/pwm/pwm-sun4i.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/pwm/pwm-sun4i.c +9 -0
@@ -367,6 +367,12 @@ static const struct sun4i_pwm_data sun4i_pwm_single_bypass = { .npwm = 1, }; +static const struct sun4i_pwm_data sun50i_h6_pwm_data = { + .has_prescaler_bypass = true, + .has_direct_mod_clk_output = true, + .npwm =2 , +}; +static const struct of_device_id sun4i_pwm_dt_ids[] = { { .compatible ="allwinner,sun4i-a10-pwm" ,
@@ -383,6 +389,9 @@ static const struct of_device_id sun4i_pwm_dt_ids[] = { }, { .compatible = "allwinner,sun8i-h3-pwm", .data = &sun4i_pwm_single_bypass, + }, { + .compatible = "allwinner,sun50i-h6-pwm", + .data = &sun50i_h6_pwm_data, }, { /* sentinel */ },
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-6-peron.clem%40gmail.com.
Re: [PATCH v4 5/7] pwm: sun4i: Add support for H6 PWM
Quoted 5 lines · Clément Péron
From: Jernej Skrabec <[email protected]>
Now that sun4i PWM driver supports deasserting reset line and enabling bus clock, support for H6 PWM can be added.
Quoted 7 lines
Note that while H6 PWM has two channels, only first one is wired to output pin. Second channel is used as a clock source to companion AC200 chip which is bundled into same package.
Signed-off-by Jernej Skrabec <[email protected]>Signed-off-by Clément Péron <[email protected]>Acked-by Uwe Kleine-König <[email protected]>
Very minor nitpick: The order here is wrong, your S-o-b should be the last thing here.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
PATCH v4 6/7 arm64: dts: allwinner: h6: Add PWM node
In reply to Clément PéronFrom: Jernej Skrabec <[email protected]>
Allwinner H6 PWM is similar to that in A20 except that it has additional bus clock and reset line.
Note that first PWM channel is connected to output pin and second channel is used internally, as a clock source to AC200 co-packaged chip. This means that any combination of these two channels can be used and thus it doesn't make sense to add pinctrl nodes at this point.
--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
@@ -222,6 +222,16 @@ status = "disabled"; }; + pwm: pwm@300a000 { + compatible = "allwinner,sun50i-h6-pwm"; + reg = <0x0300a000 0x400>; + clocks = <&osc24M>, <&ccu CLK_BUS_PWM>; + clock-names = "mod", "bus"; + resets = <&ccu RST_BUS_PWM>; + #pwm-cells = <3>; + status = "disabled"; + }; + pio: pinctrl@300b000 { compatible = "allwinner,sun50i-h6-pinctrl"; reg = <0x0300b000 0x400>;
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-7-peron.clem%40gmail.com.
PATCH v4 7/7 arm64: allwinner: h6: enable Beelink GS1 PWM
In reply to Clément Péron--- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +4 -0
@@ -131,6 +131,10 @@ vcc-pg-supply = <®_aldo1>; }; +&pwm { + status = "okay"; +}; + &r_i2c { status = "okay";
Signature · 6 lines
2.20.1 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20191108084517.21617-8-peron.clem%40gmail.com.