Support PWM on MediaTek MT7981
Subsystems (3)
v2 cover Support PWM on MediaTek MT7981
Add support for PWM on the MediaTek MT7981 to pwm-mediatek.c as well as new mediatek,mt7981-pwm compatible string to the existing bindings.
Changes since v1:
* use pointer to reg_offset instead of u8 reg_ver and if-else
Daniel Golle (2):
dt-bindings: pwm: mediatek: Add mediatek,mt7981 compatible
pwm: mediatek: Add support for MT7981
.../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + drivers/pwm/pwm-mediatek.c | 39 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-)
base-commit: 3cdbc01c40e34c57697f8934f2727a88551696be
Signature · 1 line
2.40.0
PATCH v2 1/2 dt-bindings: pwm: mediatek: Add mediatek,mt7981 compatible
Add compatible string for the PWM unit found of the MediaTek MT7981 SoC. This is in preparation to adding support in the pwm-mediatek.c driver.
---
No changes since v1.
Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml +1 -0
@@ -22,6 +22,7 @@ properties: - mediatek,mt7623-pwm - mediatek,mt7628-pwm - mediatek,mt7629-pwm + - mediatek,mt7981-pwm - mediatek,mt7986-pwm - mediatek,mt8183-pwm - mediatek,mt8365-pwm
Signature · 1 line
2.40.0
Re: [PATCH v2 1/2] dt-bindings: pwm: mediatek: Add mediatek,mt7981 compatible
Quoted 7 lines · Daniel Golle
Add compatible string for the PWM unit found of the MediaTek MT7981 SoC. This is in preparation to adding support in the
pwm-mediatek.cdriver.Signed-off-by Daniel Golle <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>---
No changes since v1.
Best regards,
Krzysztof
PATCH v2 2/2 pwm: mediatek: Add support for MT7981
In reply to Daniel GolleThe PWM unit on MT7981 uses different register offsets than previous MediaTek PWM units. Add support for these new offsets and add support for PWM on MT7981 which has 3 PWM channels, one of them is typically used for a temperature controlled fan.
---
Changes since v1:
* use pointer to reg_offset instead of u8 reg_ver and if-else
drivers/pwm/pwm-mediatek.c | 39 ++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/pwm/pwm-mediatek.c +31 -8
@@ -38,6 +38,7 @@ struct pwm_mediatek_of_data {unsigned int num_pwms;bool pwm45_fixup;bool has_ck_26m_sel; +const unsigned int *reg_offset; };/**
@@ -59,10 +60,14 @@ struct pwm_mediatek_chip {const struct pwm_mediatek_of_data *soc; }; -static const unsigned int pwm_mediatek_reg_offset[] = { +static const unsigned int mtk_pwm_reg_offset_v1[] = {0x0010 ,0x0050 ,0x0090 ,0x00d0 ,0x0110 ,0x0150 ,0x0190 ,0x0220 }; +static const unsigned int mtk_pwm_reg_offset_v2[] = { +0x0080 ,0x00c0 ,0x0100 ,0x0140 ,0x0180 ,0x01c0 ,0x0200 ,0x0240 +}; +static inline struct pwm_mediatek_chip *to_pwm_mediatek_chip (struct pwm_chip *chip) {
@@ -111,7 +116,7 @@ static inline void pwm_mediatek_writel(struct pwm_mediatek_chip *chip, unsigned int num, unsigned int offset, u32 value) { - writel(value, chip->regs + pwm_mediatek_reg_offset[num] + offset); + writel(value, chip->regs + chip->soc->reg_offset[num] + offset); } static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,
@@ -285,60 +290,77 @@ static const struct pwm_mediatek_of_data mt2712_pwm_data = { .num_pwms = 8, .pwm45_fixup = false, .has_ck_26m_sel = false, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt6795_pwm_data = { .num_pwms =7 , .pwm45_fixup = false, .has_ck_26m_sel = false, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt7622_pwm_data = { .num_pwms =6 , .pwm45_fixup = false, .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt7623_pwm_data = { .num_pwms =5 , .pwm45_fixup = true, .has_ck_26m_sel = false, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt7628_pwm_data = { .num_pwms =4 , .pwm45_fixup = true, .has_ck_26m_sel = false, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt7629_pwm_data = { .num_pwms =1 , .pwm45_fixup = false, .has_ck_26m_sel = false, + .reg_offset = mtk_pwm_reg_offset_v1, }; -static const struct pwm_mediatek_of_data mt8183_pwm_data = { - .num_pwms =4 , +static const struct pwm_mediatek_of_data mt7981_pwm_data = { + .num_pwms =3 , .pwm45_fixup = false, .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v2, }; -static const struct pwm_mediatek_of_data mt8365_pwm_data = { - .num_pwms =3 , +static const struct pwm_mediatek_of_data mt7986_pwm_data = { + .num_pwms =2 , .pwm45_fixup = false, .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v1, }; -static const struct pwm_mediatek_of_data mt7986_pwm_data = { - .num_pwms =2 , +static const struct pwm_mediatek_of_data mt8183_pwm_data = { + .num_pwms =4 , + .pwm45_fixup = false, + .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v1, +}; + +static const struct pwm_mediatek_of_data mt8365_pwm_data = { + .num_pwms =3 , .pwm45_fixup = false, .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct pwm_mediatek_of_data mt8516_pwm_data = { .num_pwms =5 , .pwm45_fixup = false, .has_ck_26m_sel = true, + .reg_offset = mtk_pwm_reg_offset_v1, };static const struct of_device_id pwm_mediatek_of_match[] = {
@@ -348,6 +370,7 @@ static const struct of_device_id pwm_mediatek_of_match[] = { { .compatible = "mediatek,mt7623-pwm", .data = &mt7623_pwm_data }, { .compatible = "mediatek,mt7628-pwm", .data = &mt7628_pwm_data }, { .compatible = "mediatek,mt7629-pwm", .data = &mt7629_pwm_data }, + { .compatible = "mediatek,mt7981-pwm", .data = &mt7981_pwm_data }, { .compatible = "mediatek,mt7986-pwm", .data = &mt7986_pwm_data }, { .compatible = "mediatek,mt8183-pwm", .data = &mt8183_pwm_data }, { .compatible = "mediatek,mt8365-pwm", .data = &mt8365_pwm_data },
Signature · 1 line
2.40.0
Re: [PATCH v2 2/2] pwm: mediatek: Add support for MT7981
Il 20/04/23 14:36, Daniel Golle ha scritto:
Quoted 6 lines
The PWM unit on MT7981 uses different register offsets than previous MediaTek PWM units. Add support for these new offsets and add support for PWM on MT7981 which has 3 PWM channels, one of them is typically used for a temperature controlled fan.
Signed-off-by Daniel Golle <[email protected]>
The implementation is good now; there's only one nitpick: you're reordering the platform data entries and I agree about doing that, as they should be alphabetically sorted, but you didn't mention that in the commit message.
Please send a v3 that mentions that you're also reordering.
"...while at it, also reorder..."
After which: