pwm: imx: Remove redundant i.MX PWMv2 code

The code providing functionality surpassed by the atomic PWM is not
needed anymore and hence can be removed.

Suggested-by: Stefan Agner <stefan@agner.ch>
Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

1 files changed, 0 insertions, 127 deletions

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 34f3031d5c40..0a81c028cb11 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -53,10 +53,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)
@@ -159,95 +155,6 @@ static void imx_pwm_wait_fifo_slot(struct pwm_chip *chip,
         }
 }
 
-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;
-
-        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_per);
-        if (ret)
-                return ret;
-
-        ret = imx->config(chip, pwm, duty_ns, period_ns);
-
-        clk_disable_unprepare(imx->clk_per);
-
-        return ret;
-}
-
 static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm,
                             struct pwm_state *state)
 {
@@ -314,29 +221,6 @@ static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm,
         return 0;
 }
 
-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 const struct pwm_ops imx_pwm_ops_v1 = {
         .enable = imx_pwm_enable_v1,
         .disable = imx_pwm_disable_v1,
@@ -346,16 +230,10 @@ static const struct pwm_ops imx_pwm_ops_v1 = {
 
 static const struct pwm_ops imx_pwm_ops_v2 = {
         .apply = imx_pwm_apply_v2,
-        .enable = imx_pwm_enable,
-        .disable = imx_pwm_disable,
-        .config = imx_pwm_config,
         .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);
         const struct pwm_ops *ops;
 };
 
@@ -364,8 +242,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,
         .ops = &imx_pwm_ops_v2,
 };
 
@@ -412,9 +288,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;