Re: [PATCH 5/6] pwm: imx: Remove redundant IMX PWMv2 code

[Boris Brezillon]

On Sun, 23 Oct 2016 23:45:45 +0200
Lukasz Majewski <l.majewski@xxxxxxxxx> wrote:

> The code providing functionality surpassed by the PWM atomic is not needed
> anymore and hence can be removed.
> 
> Suggested-by: Stefan Agner <stefan@xxxxxxxx>
> Suggested-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Lukasz Majewski <l.majewski@xxxxxxxxx>

Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>

> ---
>  drivers/pwm/pwm-imx.c | 155 --------------------------------------------------
>  1 file changed, 155 deletions(-)
> 
> diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
> index df25379..02d3dfd 100644
> --- a/drivers/pwm/pwm-imx.c
> +++ b/drivers/pwm/pwm-imx.c
> @@ -55,10 +55,6 @@ struct imx_chip {
>  	void __iomem	*mmio_base;
>  
>  	struct pwm_chip	chip;
> -
> -	int (*config)(struct pwm_chip *chip,
> -		struct pwm_device *pwm, int duty_ns, int period_ns);
> -	void (*set_enable)(struct pwm_chip *chip, bool enable);
>  };
>  
>  #define to_imx_chip(chip)	container_of(chip, struct imx_chip, chip)
> @@ -249,145 +245,6 @@ static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm,
>  	return 0;
>  }
>  
> -static int imx_pwm_config_v2(struct pwm_chip *chip,
> -		struct pwm_device *pwm, int duty_ns, int period_ns)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -	unsigned long long c;
> -	unsigned long period_cycles, duty_cycles, prescale;
> -	bool enable = pwm_is_enabled(pwm);
> -	u32 cr;
> -
> -	/*
> -	 * i.MX PWMv2 has a 4-word sample FIFO.
> -	 * In order to avoid FIFO overflow issue, we do software reset
> -	 * to clear all sample FIFO if the controller is disabled or
> -	 * wait for a full PWM cycle to get a relinquished FIFO slot
> -	 * when the controller is enabled and the FIFO is fully loaded.
> -	 */
> -	if (enable)
> -		imx_pwm_wait_fifo_slot(chip, pwm);
> -	else
> -		imx_pwm_sw_reset(chip);
> -
> -	c = clk_get_rate(imx->clk_per);
> -	c = c * period_ns;
> -	do_div(c, 1000000000);
> -	period_cycles = c;
> -
> -	prescale = period_cycles / 0x10000 + 1;
> -
> -	period_cycles /= prescale;
> -	c = (unsigned long long)period_cycles * duty_ns;
> -	do_div(c, period_ns);
> -	duty_cycles = c;
> -
> -	/*
> -	 * according to imx pwm RM, the real period value should be
> -	 * PERIOD value in PWMPR plus 2.
> -	 */
> -	if (period_cycles > 2)
> -		period_cycles -= 2;
> -	else
> -		period_cycles = 0;
> -
> -	writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
> -	writel(period_cycles, imx->mmio_base + MX3_PWMPR);
> -
> -	cr = MX3_PWMCR_PRESCALER(prescale) |
> -		MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
> -		MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
> -
> -	if (enable)
> -		cr |= MX3_PWMCR_EN;
> -
> -	if (pwm->args.polarity == PWM_POLARITY_INVERSED)
> -		cr |= MX3_PWMCR_POUTC;
> -
> -	writel(cr, imx->mmio_base + MX3_PWMCR);
> -
> -	return 0;
> -}
> -
> -static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -	u32 val;
> -
> -	val = readl(imx->mmio_base + MX3_PWMCR);
> -
> -	if (enable)
> -		val |= MX3_PWMCR_EN;
> -	else
> -		val &= ~MX3_PWMCR_EN;
> -
> -	writel(val, imx->mmio_base + MX3_PWMCR);
> -}
> -
> -static int imx_pwm_config(struct pwm_chip *chip,
> -		struct pwm_device *pwm, int duty_ns, int period_ns)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -	int ret;
> -
> -	ret = clk_prepare_enable(imx->clk_ipg);
> -	if (ret)
> -		return ret;
> -
> -	ret = imx->config(chip, pwm, duty_ns, period_ns);
> -
> -	clk_disable_unprepare(imx->clk_ipg);
> -
> -	return ret;
> -}
> -
> -static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -	int ret;
> -
> -	ret = clk_prepare_enable(imx->clk_per);
> -	if (ret)
> -		return ret;
> -
> -	imx->set_enable(chip, true);
> -
> -	return 0;
> -}
> -
> -static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -
> -	imx->set_enable(chip, false);
> -
> -	clk_disable_unprepare(imx->clk_per);
> -}
> -
> -static int imx_pwm_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm,
> -				enum pwm_polarity polarity)
> -{
> -	struct imx_chip *imx = to_imx_chip(chip);
> -	u32 val;
> -
> -	if (polarity == pwm->args.polarity)
> -		return 0;
> -
> -	val = readl(imx->mmio_base + MX3_PWMCR);
> -
> -	if (polarity == PWM_POLARITY_INVERSED)
> -		val |= MX3_PWMCR_POUTC;
> -	else
> -		val &= ~MX3_PWMCR_POUTC;
> -
> -	writel(val, imx->mmio_base + MX3_PWMCR);
> -
> -	dev_dbg(imx->chip.dev, "%s: polarity set to %s\n", __func__,
> -		polarity == PWM_POLARITY_INVERSED ? "inverted" : "normal");
> -
> -	return 0;
> -}
> -
>  static struct pwm_ops imx_pwm_ops_v1 = {
>  	.enable = imx_pwm_enable_v1,
>  	.disable = imx_pwm_disable_v1,
> @@ -396,18 +253,11 @@ static struct pwm_ops imx_pwm_ops_v1 = {
>  };
>  
>  static struct pwm_ops imx_pwm_ops_v2 = {
> -	.enable = imx_pwm_enable,
> -	.disable = imx_pwm_disable,
> -	.set_polarity = imx_pwm_set_polarity,
> -	.config = imx_pwm_config,
>  	.apply = imx_pwm_apply_v2,
>  	.owner = THIS_MODULE,
>  };
>  
>  struct imx_pwm_data {
> -	int (*config)(struct pwm_chip *chip,
> -		struct pwm_device *pwm, int duty_ns, int period_ns);
> -	void (*set_enable)(struct pwm_chip *chip, bool enable);
>  	struct pwm_ops *pwm_ops;
>  };
>  
> @@ -416,8 +266,6 @@ static struct imx_pwm_data imx_pwm_data_v1 = {
>  };
>  
>  static struct imx_pwm_data imx_pwm_data_v2 = {
> -	.config = imx_pwm_config_v2,
> -	.set_enable = imx_pwm_set_enable_v2,
>  	.pwm_ops = &imx_pwm_ops_v2,
>  };
>  
> @@ -476,9 +324,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
>  	if (IS_ERR(imx->mmio_base))
>  		return PTR_ERR(imx->mmio_base);
>  
> -	imx->config = data->config;
> -	imx->set_enable = data->set_enable;
> -
>  	ret = pwmchip_add(&imx->chip);
>  	if (ret < 0)
>  		return ret;