Commit ebbfb159 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Thierry Reding
Browse files

pwm: mxs: Remove legacy methods 



Since we now have ->apply(), these are no longer relevant.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent bf29c2ff

drivers/pwm/pwm-mxs.c

+0 −77
Original line number Diff line number Diff line
@@ -110,85 +110,8 @@ static int mxs_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	return 0;

}



static int mxs_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,

			  int duty_ns, int period_ns)

{

	struct mxs_pwm_chip *mxs = to_mxs_pwm_chip(chip);

	int ret, div = 0;

	unsigned int period_cycles, duty_cycles;

	unsigned long rate;

	unsigned long long c;



	rate = clk_get_rate(mxs->clk);

	while (1) {

		c = rate / cdiv[div];

		c = c * period_ns;

		do_div(c, 1000000000);

		if (c < PERIOD_PERIOD_MAX)

			break;

		div++;

		if (div >= PERIOD_CDIV_MAX)

			return -EINVAL;

	}



	period_cycles = c;

	c *= duty_ns;

	do_div(c, period_ns);

	duty_cycles = c;



	/*

	 * If the PWM channel is disabled, make sure to turn on the clock

	 * before writing the register. Otherwise, keep it enabled.

	 */

	if (!pwm_is_enabled(pwm)) {

		ret = clk_prepare_enable(mxs->clk);

		if (ret)

			return ret;

	}



	writel(duty_cycles << 16,

			mxs->base + PWM_ACTIVE0 + pwm->hwpwm * 0x20);

	writel(PERIOD_PERIOD(period_cycles) | PERIOD_ACTIVE_HIGH |

	       PERIOD_INACTIVE_LOW | PERIOD_CDIV(div),

			mxs->base + PWM_PERIOD0 + pwm->hwpwm * 0x20);



	/*

	 * If the PWM is not enabled, turn the clock off again to save power.

	 */

	if (!pwm_is_enabled(pwm))

		clk_disable_unprepare(mxs->clk);



	return 0;

}



static int mxs_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct mxs_pwm_chip *mxs = to_mxs_pwm_chip(chip);

	int ret;



	ret = clk_prepare_enable(mxs->clk);

	if (ret)

		return ret;



	writel(1 << pwm->hwpwm, mxs->base + PWM_CTRL + SET);



	return 0;

}



static void mxs_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct mxs_pwm_chip *mxs = to_mxs_pwm_chip(chip);



	writel(1 << pwm->hwpwm, mxs->base + PWM_CTRL + CLR);



	clk_disable_unprepare(mxs->clk);

}



static const struct pwm_ops mxs_pwm_ops = {

	.apply = mxs_pwm_apply,

	.config = mxs_pwm_config,

	.enable = mxs_pwm_enable,

	.disable = mxs_pwm_disable,

	.owner = THIS_MODULE,

};