Merge tag 'fsnotify_for_v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[J-linux.git] / drivers / pwm / pwm-imx27.c

diff --git a/drivers/pwm/pwm-imx27.c b/drivers/pwm/pwm-imx27.c
index 7d9bc43f12b0e96cf33b15e1a6f4247f8555d907..e1412116ef6534125e3a12d5962e79ed24ec483a 100644 (file)
--- a/drivers/pwm/pwm-imx27.c
+++ b/drivers/pwm/pwm-imx27.c
@@ -83,7 +83,6 @@ struct pwm_imx27_chip {
        struct clk      *clk_ipg;
        struct clk      *clk_per;
        void __iomem    *mmio_base;
-       struct pwm_chip chip;
 
        /*
         * The driver cannot read the current duty cycle from the hardware if
@@ -93,7 +92,10 @@ struct pwm_imx27_chip {
        unsigned int duty_cycle;
 };
 
-#define to_pwm_imx27_chip(chip)        container_of(chip, struct pwm_imx27_chip, chip)
+static inline struct pwm_imx27_chip *to_pwm_imx27_chip(struct pwm_chip *chip)
+{
+       return pwmchip_get_drvdata(chip);
+}
 
 static int pwm_imx27_clk_prepare_enable(struct pwm_imx27_chip *imx)
 {
@@ -145,7 +147,7 @@ static int pwm_imx27_get_state(struct pwm_chip *chip,
                state->polarity = PWM_POLARITY_INVERSED;
                break;
        default:
-               dev_warn(chip->dev, "can't set polarity, output disconnected");
+               dev_warn(pwmchip_parent(chip), "can't set polarity, output disconnected");
        }
 
        prescaler = MX3_PWMCR_PRESCALER_GET(val);
@@ -177,7 +179,7 @@ static int pwm_imx27_get_state(struct pwm_chip *chip,
 static void pwm_imx27_sw_reset(struct pwm_chip *chip)
 {
        struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip);
-       struct device *dev = chip->dev;
+       struct device *dev = pwmchip_parent(chip);
        int wait_count = 0;
        u32 cr;
 
@@ -196,7 +198,7 @@ static void pwm_imx27_wait_fifo_slot(struct pwm_chip *chip,
                                     struct pwm_device *pwm)
 {
        struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip);
-       struct device *dev = chip->dev;
+       struct device *dev = pwmchip_parent(chip);
        unsigned int period_ms;
        int fifoav;
        u32 sr;
@@ -204,8 +206,8 @@ static void pwm_imx27_wait_fifo_slot(struct pwm_chip *chip,
        sr = readl(imx->mmio_base + MX3_PWMSR);
        fifoav = FIELD_GET(MX3_PWMSR_FIFOAV, sr);
        if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
-               period_ms = DIV_ROUND_UP_ULL(pwm_get_period(pwm),
-                                        NSEC_PER_MSEC);
+               period_ms = DIV_ROUND_UP_ULL(pwm->state.period,
+                                            NSEC_PER_MSEC);
                msleep(period_ms);
 
                sr = readl(imx->mmio_base + MX3_PWMSR);
@@ -219,14 +221,11 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 {
        unsigned long period_cycles, duty_cycles, prescale;
        struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip);
-       struct pwm_state cstate;
        unsigned long long c;
        unsigned long long clkrate;
        int ret;
        u32 cr;
 
-       pwm_get_state(pwm, &cstate);
-
        clkrate = clk_get_rate(imx->clk_per);
        c = clkrate * state->period;
 
@@ -254,7 +253,7 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
         * Wait for a free FIFO slot if the PWM is already enabled, and flush
         * the FIFO if the PWM was disabled and is about to be enabled.
         */
-       if (cstate.enabled) {
+       if (pwm->state.enabled) {
                pwm_imx27_wait_fifo_slot(chip, pwm);
        } else {
                ret = pwm_imx27_clk_prepare_enable(imx);
@@ -306,13 +305,15 @@ MODULE_DEVICE_TABLE(of, pwm_imx27_dt_ids);
 
 static int pwm_imx27_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct pwm_imx27_chip *imx;
        int ret;
        u32 pwmcr;
 
-       imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
-       if (imx == NULL)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*imx));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       imx = to_pwm_imx27_chip(chip);
 
        imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
        if (IS_ERR(imx->clk_ipg))
@@ -324,9 +325,7 @@ static int pwm_imx27_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, PTR_ERR(imx->clk_per),
                                     "failed to get peripheral clock\n");
 
-       imx->chip.ops = &pwm_imx27_ops;
-       imx->chip.dev = &pdev->dev;
-       imx->chip.npwm = 1;
+       chip->ops = &pwm_imx27_ops;
 
        imx->mmio_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(imx->mmio_base))
@@ -341,7 +340,7 @@ static int pwm_imx27_probe(struct platform_device *pdev)
        if (!(pwmcr & MX3_PWMCR_EN))
                pwm_imx27_clk_disable_unprepare(imx);
 
-       return devm_pwmchip_add(&pdev->dev, &imx->chip);
+       return devm_pwmchip_add(&pdev->dev, chip);
 }
 
 static struct platform_driver imx_pwm_driver = {