pwm: meson: Change prototype of a few helpers to prepare further changes

This prepares the driver for further changes that will make it harder to
determine the pwm_chip from a given meson_pwm. To just not have to do
that, rework meson_pwm_calc(), meson_pwm_enable(), meson_pwm_disable()
and meson_pwm_init_channels() to take a pwm_chip.

Link: https://lore.kernel.org/r/157084e1dd464da0097edba880240868c1c0b27e.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 2971bbf3b5e7c6e7ecf1a2f7659450e28e0edf72..7ce41811537dd0808baf1bb46c73903744569cdf 100644 (file)
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -143,9 +143,10 @@ static void meson_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
        clk_disable_unprepare(channel->clk);
 }
 
-static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm,
+static int meson_pwm_calc(struct pwm_chip *chip, struct pwm_device *pwm,
                          const struct pwm_state *state)
 {
+       struct meson_pwm *meson = to_meson_pwm(chip);
        struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];
        unsigned int cnt, duty_cnt;
        unsigned long fin_freq;
@@ -169,19 +170,19 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm,
 
        fin_freq = clk_round_rate(channel->clk, freq);
        if (fin_freq == 0) {
-               dev_err(meson->chip.dev, "invalid source clock frequency\n");
+               dev_err(chip->dev, "invalid source clock frequency\n");
                return -EINVAL;
        }
 
-       dev_dbg(meson->chip.dev, "fin_freq: %lu Hz\n", fin_freq);
+       dev_dbg(chip->dev, "fin_freq: %lu Hz\n", fin_freq);
 
        cnt = div_u64(fin_freq * period, NSEC_PER_SEC);
        if (cnt > 0xffff) {
-               dev_err(meson->chip.dev, "unable to get period cnt\n");
+               dev_err(chip->dev, "unable to get period cnt\n");
                return -EINVAL;
        }
 
-       dev_dbg(meson->chip.dev, "period=%llu cnt=%u\n", period, cnt);
+       dev_dbg(chip->dev, "period=%llu cnt=%u\n", period, cnt);
 
        if (duty == period) {
                channel->hi = cnt;
@@ -192,7 +193,7 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm,
        } else {
                duty_cnt = div_u64(fin_freq * duty, NSEC_PER_SEC);
 
-               dev_dbg(meson->chip.dev, "duty=%llu duty_cnt=%u\n", duty, duty_cnt);
+               dev_dbg(chip->dev, "duty=%llu duty_cnt=%u\n", duty, duty_cnt);
 
                channel->hi = duty_cnt;
                channel->lo = cnt - duty_cnt;
@@ -203,8 +204,9 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm,
        return 0;
 }
 
-static void meson_pwm_enable(struct meson_pwm *meson, struct pwm_device *pwm)
+static void meson_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
+       struct meson_pwm *meson = to_meson_pwm(chip);
        struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];
        struct meson_pwm_channel_data *channel_data;
        unsigned long flags;
@@ -215,7 +217,7 @@ static void meson_pwm_enable(struct meson_pwm *meson, struct pwm_device *pwm)
 
        err = clk_set_rate(channel->clk, channel->rate);
        if (err)
-               dev_err(meson->chip.dev, "setting clock rate failed\n");
+               dev_err(chip->dev, "setting clock rate failed\n");
 
        spin_lock_irqsave(&meson->lock, flags);
 
@@ -230,8 +232,9 @@ static void meson_pwm_enable(struct meson_pwm *meson, struct pwm_device *pwm)
        spin_unlock_irqrestore(&meson->lock, flags);
 }
 
-static void meson_pwm_disable(struct meson_pwm *meson, struct pwm_device *pwm)
+static void meson_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
+       struct meson_pwm *meson = to_meson_pwm(chip);
        unsigned long flags;
        u32 value;
 
@@ -269,16 +272,16 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                        channel->hi = ~0;
                        channel->lo = 0;
 
-                       meson_pwm_enable(meson, pwm);
+                       meson_pwm_enable(chip, pwm);
                } else {
-                       meson_pwm_disable(meson, pwm);
+                       meson_pwm_disable(chip, pwm);
                }
        } else {
-               err = meson_pwm_calc(meson, pwm, state);
+               err = meson_pwm_calc(chip, pwm, state);
                if (err < 0)
                        return err;
 
-               meson_pwm_enable(meson, pwm);
+               meson_pwm_enable(chip, pwm);
        }
 
        return 0;
@@ -432,10 +435,11 @@ static const struct of_device_id meson_pwm_matches[] = {
 };
 MODULE_DEVICE_TABLE(of, meson_pwm_matches);
 
-static int meson_pwm_init_channels(struct meson_pwm *meson)
+static int meson_pwm_init_channels(struct pwm_chip *chip)
 {
+       struct meson_pwm *meson = to_meson_pwm(chip);
        struct clk_parent_data mux_parent_data[MESON_MAX_MUX_PARENTS] = {};
-       struct device *dev = meson->chip.dev;
+       struct device *dev = chip->dev;
        unsigned int i;
        char name[255];
        int err;
@@ -445,7 +449,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson)
                mux_parent_data[i].name = meson->data->parent_names[i];
        }
 
-       for (i = 0; i < meson->chip.npwm; i++) {
+       for (i = 0; i < chip->npwm; i++) {
                struct meson_pwm_channel *channel = &meson->channels[i];
                struct clk_parent_data div_parent = {}, gate_parent = {};
                struct clk_init_data init = {};
@@ -543,7 +547,7 @@ static int meson_pwm_probe(struct platform_device *pdev)
 
        meson->data = of_device_get_match_data(&pdev->dev);
 
-       err = meson_pwm_init_channels(meson);
+       err = meson_pwm_init_channels(&meson->chip);
        if (err < 0)
                return err;