Subject: [PATCH v6 1/2] pwm: meson: Add support for Amlogic S4 PWM

From: Junyi Zhao <[email protected]>

Add support for Amlogic S4 PWM.

Signed-off-by: Junyi Zhao <[email protected]>
Signed-off-by: Kelvin Zhang <[email protected]>
---
drivers/pwm/pwm-meson.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index b2f97dfb01bb..a513ebbb5666 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -460,6 +460,47 @@ static int meson_pwm_init_channels_meson8b_v2(struct pwm_chip *chip)
return meson_pwm_init_clocks_meson8b(chip, mux_parent_data);
}

+static void meson_pwm_s4_put_clk(void *data)
+{
+ struct meson_pwm *meson = (struct meson_pwm *)data;
+ int i;
+
+ for (i = 0; i < MESON_NUM_PWMS; i++)
+ clk_put(meson->channels[i].clk);
+}
+
+static int meson_pwm_init_channels_s4(struct pwm_chip *chip)
+{
+ struct device *dev = pwmchip_parent(chip);
+ struct device_node *np = dev->of_node;
+ struct meson_pwm *meson = to_meson_pwm(chip);
+ struct meson_pwm_channel *channel;
+ int i, ret;
+
+ for (i = 0; i < MESON_NUM_PWMS; i++) {
+ channel = &meson->channels[i];
+ channel->clk = of_clk_get(np, i);
+ if (IS_ERR(channel->clk)) {
+ ret = PTR_ERR(channel->clk);
+ dev_err_probe(dev, ret, "Failed to get clk\n");
+ goto err;
+ }
+ }
+ ret = devm_add_action_or_reset(dev, meson_pwm_s4_put_clk, meson);
+ if (ret)
+ return ret;
+
+ return 0;
+
+err:
+ while (--i >= 0) {
+ channel = &meson->channels[i];
+ clk_put(channel->clk);
+ }
+
+ return ret;
+}
+
static const struct meson_pwm_data pwm_meson8b_data = {
.parent_names = { "xtal", NULL, "fclk_div4", "fclk_div3" },
.channels_init = meson_pwm_init_channels_meson8b_legacy,
@@ -498,6 +539,10 @@ static const struct meson_pwm_data pwm_meson8_v2_data = {
.channels_init = meson_pwm_init_channels_meson8b_v2,
};

+static const struct meson_pwm_data pwm_s4_data = {
+ .channels_init = meson_pwm_init_channels_s4,
+};
+
static const struct of_device_id meson_pwm_matches[] = {
{
.compatible = "amlogic,meson8-pwm-v2",
@@ -536,6 +581,10 @@ static const struct of_device_id meson_pwm_matches[] = {
.compatible = "amlogic,meson-g12a-ao-pwm-cd",
.data = &pwm_g12a_ao_cd_data
},
+ {
+ .compatible = "amlogic,meson-s4-pwm",
+ .data = &pwm_s4_data
+ },
{},
};
MODULE_DEVICE_TABLE(of, meson_pwm_matches);

--
2.37.1




2024-05-30 12:34:14

by George Stark

[permalink] [raw]
Subject: Re: [DMARC error][DKIM error] [PATCH v6 1/2] pwm: meson: Add support for Amlogic S4 PWM

Hello Kelvin, Junyi

On 5/29/24 13:00, Kelvin Zhang via B4 Relay wrote:
> From: Junyi Zhao <[email protected]>
>
> Add support for Amlogic S4 PWM.
>
> Signed-off-by: Junyi Zhao <[email protected]>
> Signed-off-by: Kelvin Zhang <[email protected]>
> ---
> drivers/pwm/pwm-meson.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 49 insertions(+)
>
> diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
> index b2f97dfb01bb..a513ebbb5666 100644
> --- a/drivers/pwm/pwm-meson.c
> +++ b/drivers/pwm/pwm-meson.c
> @@ -460,6 +460,47 @@ static int meson_pwm_init_channels_meson8b_v2(struct pwm_chip *chip)
> return meson_pwm_init_clocks_meson8b(chip, mux_parent_data);
> }
>
> +static void meson_pwm_s4_put_clk(void *data)
> +{
> + struct meson_pwm *meson = (struct meson_pwm *)data;
There's no need for type-casting. Here is maintainers' request for a
similar case:
https://lore.kernel.org/lkml/CAHp75VeNijg6sXyW_frwD4siJ-LWBLBfVCmMDug8jYAVVg9Bmw@mail.gmail.com/

> + int i;
> +
> + for (i = 0; i < MESON_NUM_PWMS; i++)
> + clk_put(meson->channels[i].clk);
> +}
> +
> +static int meson_pwm_init_channels_s4(struct pwm_chip *chip)
> +{
> + struct device *dev = pwmchip_parent(chip);
> + struct device_node *np = dev->of_node;
> + struct meson_pwm *meson = to_meson_pwm(chip);
> + struct meson_pwm_channel *channel;
> + int i, ret;
> +
> + for (i = 0; i < MESON_NUM_PWMS; i++) {
> + channel = &meson->channels[i];
> + channel->clk = of_clk_get(np, i);
> + if (IS_ERR(channel->clk)) {
> + ret = PTR_ERR(channel->clk);
> + dev_err_probe(dev, ret, "Failed to get clk\n");
> + goto err;
> + }
> + }
> + ret = devm_add_action_or_reset(dev, meson_pwm_s4_put_clk, meson);
> + if (ret)
> + return ret;
> +
> + return 0;
> +
> +err:
> + while (--i >= 0) {
> + channel = &meson->channels[i];
> + clk_put(channel->clk);
> + }
Just as in meson_pwm_s4_put_clk() you can write it shorter:
while (--i >= 0)
clk_put(meson->channels[i].clk);

> +
> + return ret;
> +}
> +
> static const struct meson_pwm_data pwm_meson8b_data = {
> .parent_names = { "xtal", NULL, "fclk_div4", "fclk_div3" },
> .channels_init = meson_pwm_init_channels_meson8b_legacy,
> @@ -498,6 +539,10 @@ static const struct meson_pwm_data pwm_meson8_v2_data = {
> .channels_init = meson_pwm_init_channels_meson8b_v2,
> };
>
> +static const struct meson_pwm_data pwm_s4_data = {
> + .channels_init = meson_pwm_init_channels_s4,
> +};
> +
> static const struct of_device_id meson_pwm_matches[] = {
> {
> .compatible = "amlogic,meson8-pwm-v2",
> @@ -536,6 +581,10 @@ static const struct of_device_id meson_pwm_matches[] = {
> .compatible = "amlogic,meson-g12a-ao-pwm-cd",
> .data = &pwm_g12a_ao_cd_data
> },
> + {
> + .compatible = "amlogic,meson-s4-pwm",
> + .data = &pwm_s4_data
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, meson_pwm_matches);
>

--
Best regards
George