Merge tag 'pwm/for-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[sfrench/cifs-2.6.git] / drivers / pwm / pwm-atmel.c
index 530d7dc5f1b5cdad7d10d6c9c675ffc3e1430b3a..a9fd6f0d408c318e56538e15e30d241d9a885ee3 100644 (file)
 #define PWMV2_CPRD             0x0C
 #define PWMV2_CPRDUPD          0x10
 
-/*
- * Max value for duty and period
- *
- * Although the duty and period register is 32 bit,
- * however only the LSB 16 bits are significant.
- */
-#define PWM_MAX_DTY            0xFFFF
-#define PWM_MAX_PRD            0xFFFF
-#define PRD_MAX_PRES           10
-
 struct atmel_pwm_registers {
        u8 period;
        u8 period_upd;
@@ -65,11 +55,21 @@ struct atmel_pwm_registers {
        u8 duty_upd;
 };
 
+struct atmel_pwm_config {
+       u32 max_period;
+       u32 max_pres;
+};
+
+struct atmel_pwm_data {
+       struct atmel_pwm_registers regs;
+       struct atmel_pwm_config cfg;
+};
+
 struct atmel_pwm_chip {
        struct pwm_chip chip;
        struct clk *clk;
        void __iomem *base;
-       const struct atmel_pwm_registers *regs;
+       const struct atmel_pwm_data *data;
 
        unsigned int updated_pwms;
        /* ISR is cleared when read, ensure only one thread does that */
@@ -121,10 +121,10 @@ static int atmel_pwm_calculate_cprd_and_pres(struct pwm_chip *chip,
        cycles *= clk_get_rate(atmel_pwm->clk);
        do_div(cycles, NSEC_PER_SEC);
 
-       for (*pres = 0; cycles > PWM_MAX_PRD; cycles >>= 1)
+       for (*pres = 0; cycles > atmel_pwm->data->cfg.max_period; cycles >>= 1)
                (*pres)++;
 
-       if (*pres > PRD_MAX_PRES) {
+       if (*pres > atmel_pwm->data->cfg.max_pres) {
                dev_err(chip->dev, "pres exceeds the maximum value\n");
                return -EINVAL;
        }
@@ -150,15 +150,15 @@ static void atmel_pwm_update_cdty(struct pwm_chip *chip, struct pwm_device *pwm,
        struct atmel_pwm_chip *atmel_pwm = to_atmel_pwm_chip(chip);
        u32 val;
 
-       if (atmel_pwm->regs->duty_upd ==
-           atmel_pwm->regs->period_upd) {
+       if (atmel_pwm->data->regs.duty_upd ==
+           atmel_pwm->data->regs.period_upd) {
                val = atmel_pwm_ch_readl(atmel_pwm, pwm->hwpwm, PWM_CMR);
                val &= ~PWM_CMR_UPD_CDTY;
                atmel_pwm_ch_writel(atmel_pwm, pwm->hwpwm, PWM_CMR, val);
        }
 
        atmel_pwm_ch_writel(atmel_pwm, pwm->hwpwm,
-                           atmel_pwm->regs->duty_upd, cdty);
+                           atmel_pwm->data->regs.duty_upd, cdty);
 }
 
 static void atmel_pwm_set_cprd_cdty(struct pwm_chip *chip,
@@ -168,9 +168,9 @@ static void atmel_pwm_set_cprd_cdty(struct pwm_chip *chip,
        struct atmel_pwm_chip *atmel_pwm = to_atmel_pwm_chip(chip);
 
        atmel_pwm_ch_writel(atmel_pwm, pwm->hwpwm,
-                           atmel_pwm->regs->duty, cdty);
+                           atmel_pwm->data->regs.duty, cdty);
        atmel_pwm_ch_writel(atmel_pwm, pwm->hwpwm,
-                           atmel_pwm->regs->period, cprd);
+                           atmel_pwm->data->regs.period, cprd);
 }
 
 static void atmel_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm,
@@ -225,7 +225,7 @@ static int atmel_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                    cstate.polarity == state->polarity &&
                    cstate.period == state->period) {
                        cprd = atmel_pwm_ch_readl(atmel_pwm, pwm->hwpwm,
-                                                 atmel_pwm->regs->period);
+                                                 atmel_pwm->data->regs.period);
                        atmel_pwm_calculate_cdty(state, cprd, &cdty);
                        atmel_pwm_update_cdty(chip, pwm, cdty);
                        return 0;
@@ -277,27 +277,55 @@ static const struct pwm_ops atmel_pwm_ops = {
        .owner = THIS_MODULE,
 };
 
-static const struct atmel_pwm_registers atmel_pwm_regs_v1 = {
-       .period         = PWMV1_CPRD,
-       .period_upd     = PWMV1_CUPD,
-       .duty           = PWMV1_CDTY,
-       .duty_upd       = PWMV1_CUPD,
+static const struct atmel_pwm_data atmel_sam9rl_pwm_data = {
+       .regs = {
+               .period         = PWMV1_CPRD,
+               .period_upd     = PWMV1_CUPD,
+               .duty           = PWMV1_CDTY,
+               .duty_upd       = PWMV1_CUPD,
+       },
+       .cfg = {
+               /* 16 bits to keep period and duty. */
+               .max_period     = 0xffff,
+               .max_pres       = 10,
+       },
+};
+
+static const struct atmel_pwm_data atmel_sama5_pwm_data = {
+       .regs = {
+               .period         = PWMV2_CPRD,
+               .period_upd     = PWMV2_CPRDUPD,
+               .duty           = PWMV2_CDTY,
+               .duty_upd       = PWMV2_CDTYUPD,
+       },
+       .cfg = {
+               /* 16 bits to keep period and duty. */
+               .max_period     = 0xffff,
+               .max_pres       = 10,
+       },
 };
 
-static const struct atmel_pwm_registers atmel_pwm_regs_v2 = {
-       .period         = PWMV2_CPRD,
-       .period_upd     = PWMV2_CPRDUPD,
-       .duty           = PWMV2_CDTY,
-       .duty_upd       = PWMV2_CDTYUPD,
+static const struct atmel_pwm_data mchp_sam9x60_pwm_data = {
+       .regs = {
+               .period         = PWMV1_CPRD,
+               .period_upd     = PWMV1_CUPD,
+               .duty           = PWMV1_CDTY,
+               .duty_upd       = PWMV1_CUPD,
+       },
+       .cfg = {
+               /* 32 bits to keep period and duty. */
+               .max_period     = 0xffffffff,
+               .max_pres       = 10,
+       },
 };
 
 static const struct platform_device_id atmel_pwm_devtypes[] = {
        {
                .name = "at91sam9rl-pwm",
-               .driver_data = (kernel_ulong_t)&atmel_pwm_regs_v1,
+               .driver_data = (kernel_ulong_t)&atmel_sam9rl_pwm_data,
        }, {
                .name = "sama5d3-pwm",
-               .driver_data = (kernel_ulong_t)&atmel_pwm_regs_v2,
+               .driver_data = (kernel_ulong_t)&atmel_sama5_pwm_data,
        }, {
                /* sentinel */
        },
@@ -307,20 +335,23 @@ MODULE_DEVICE_TABLE(platform, atmel_pwm_devtypes);
 static const struct of_device_id atmel_pwm_dt_ids[] = {
        {
                .compatible = "atmel,at91sam9rl-pwm",
-               .data = &atmel_pwm_regs_v1,
+               .data = &atmel_sam9rl_pwm_data,
        }, {
                .compatible = "atmel,sama5d3-pwm",
-               .data = &atmel_pwm_regs_v2,
+               .data = &atmel_sama5_pwm_data,
        }, {
                .compatible = "atmel,sama5d2-pwm",
-               .data = &atmel_pwm_regs_v2,
+               .data = &atmel_sama5_pwm_data,
+       }, {
+               .compatible = "microchip,sam9x60-pwm",
+               .data = &mchp_sam9x60_pwm_data,
        }, {
                /* sentinel */
        },
 };
 MODULE_DEVICE_TABLE(of, atmel_pwm_dt_ids);
 
-static inline const struct atmel_pwm_registers *
+static inline const struct atmel_pwm_data *
 atmel_pwm_get_driver_data(struct platform_device *pdev)
 {
        const struct platform_device_id *id;
@@ -330,18 +361,18 @@ atmel_pwm_get_driver_data(struct platform_device *pdev)
 
        id = platform_get_device_id(pdev);
 
-       return (struct atmel_pwm_registers *)id->driver_data;
+       return (struct atmel_pwm_data *)id->driver_data;
 }
 
 static int atmel_pwm_probe(struct platform_device *pdev)
 {
-       const struct atmel_pwm_registers *regs;
+       const struct atmel_pwm_data *data;
        struct atmel_pwm_chip *atmel_pwm;
        struct resource *res;
        int ret;
 
-       regs = atmel_pwm_get_driver_data(pdev);
-       if (!regs)
+       data = atmel_pwm_get_driver_data(pdev);
+       if (!data)
                return -ENODEV;
 
        atmel_pwm = devm_kzalloc(&pdev->dev, sizeof(*atmel_pwm), GFP_KERNEL);
@@ -373,7 +404,7 @@ static int atmel_pwm_probe(struct platform_device *pdev)
 
        atmel_pwm->chip.base = -1;
        atmel_pwm->chip.npwm = 4;
-       atmel_pwm->regs = regs;
+       atmel_pwm->data = data;
        atmel_pwm->updated_pwms = 0;
        mutex_init(&atmel_pwm->isr_lock);