Skip to content

Commit c1f0d5a

Browse files
committed
Merge branch 'at91-5.10-trunk/base_pwm' into linux-5.10-mchp
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
2 parents 878ac00 + 9454fa2 commit c1f0d5a

26 files changed

Lines changed: 57 additions & 0 deletions

drivers/pwm/pwm-atmel-hlcdc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
266266
chip->chip.ops = &atmel_hlcdc_pwm_ops;
267267
chip->chip.dev = dev;
268268
chip->chip.npwm = 1;
269+
chip->chip.of_xlate = of_pwm_xlate_with_flags;
270+
chip->chip.of_pwm_n_cells = 3;
269271

270272
ret = pwmchip_add(&chip->chip);
271273
if (ret) {

drivers/pwm/pwm-atmel-tcb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,8 @@ static int atmel_tcb_pwm_probe(struct platform_device *pdev)
469469

470470
tcbpwm->chip.dev = &pdev->dev;
471471
tcbpwm->chip.ops = &atmel_tcb_pwm_ops;
472+
tcbpwm->chip.of_xlate = of_pwm_xlate_with_flags;
473+
tcbpwm->chip.of_pwm_n_cells = 3;
472474
tcbpwm->chip.npwm = NPWM;
473475
tcbpwm->channel = channel;
474476
tcbpwm->regmap = regmap;

drivers/pwm/pwm-atmel.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,8 @@ static int atmel_pwm_probe(struct platform_device *pdev)
493493

494494
atmel_pwm->chip.dev = &pdev->dev;
495495
atmel_pwm->chip.ops = &atmel_pwm_ops;
496+
atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags;
497+
atmel_pwm->chip.of_pwm_n_cells = 3;
496498
atmel_pwm->chip.npwm = 4;
497499

498500
ret = pwmchip_add(&atmel_pwm->chip);

drivers/pwm/pwm-bcm-iproc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ static int iproc_pwmc_probe(struct platform_device *pdev)
211211
ip->chip.dev = &pdev->dev;
212212
ip->chip.ops = &iproc_pwm_ops;
213213
ip->chip.npwm = 4;
214+
ip->chip.of_xlate = of_pwm_xlate_with_flags;
215+
ip->chip.of_pwm_n_cells = 3;
214216

215217
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
216218
ip->base = devm_ioremap_resource(&pdev->dev, res);

drivers/pwm/pwm-bcm-kona.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ static int kona_pwmc_probe(struct platform_device *pdev)
273273
kp->chip.dev = &pdev->dev;
274274
kp->chip.ops = &kona_pwm_ops;
275275
kp->chip.npwm = 6;
276+
kp->chip.of_xlate = of_pwm_xlate_with_flags;
277+
kp->chip.of_pwm_n_cells = 3;
276278

277279
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
278280
kp->base = devm_ioremap_resource(&pdev->dev, res);

drivers/pwm/pwm-bcm2835.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
163163
pc->chip.dev = &pdev->dev;
164164
pc->chip.ops = &bcm2835_pwm_ops;
165165
pc->chip.npwm = 2;
166+
pc->chip.of_xlate = of_pwm_xlate_with_flags;
167+
pc->chip.of_pwm_n_cells = 3;
166168

167169
platform_set_drvdata(pdev, pc);
168170

drivers/pwm/pwm-berlin.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ static int berlin_pwm_probe(struct platform_device *pdev)
209209
pwm->chip.dev = &pdev->dev;
210210
pwm->chip.ops = &berlin_pwm_ops;
211211
pwm->chip.npwm = 4;
212+
pwm->chip.of_xlate = of_pwm_xlate_with_flags;
213+
pwm->chip.of_pwm_n_cells = 3;
212214

213215
ret = pwmchip_add(&pwm->chip);
214216
if (ret < 0) {

drivers/pwm/pwm-fsl-ftm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,8 @@ static int fsl_pwm_probe(struct platform_device *pdev)
453453

454454

455455
fpc->chip.ops = &fsl_pwm_ops;
456+
fpc->chip.of_xlate = of_pwm_xlate_with_flags;
457+
fpc->chip.of_pwm_n_cells = 3;
456458
fpc->chip.npwm = 8;
457459

458460
ret = pwmchip_add(&fpc->chip);

drivers/pwm/pwm-hibvt.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ static int hibvt_pwm_probe(struct platform_device *pdev)
208208
pwm_chip->chip.ops = &hibvt_pwm_ops;
209209
pwm_chip->chip.dev = &pdev->dev;
210210
pwm_chip->chip.npwm = soc->num_pwms;
211+
pwm_chip->chip.of_xlate = of_pwm_xlate_with_flags;
212+
pwm_chip->chip.of_pwm_n_cells = 3;
211213
pwm_chip->soc = soc;
212214

213215
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/pwm/pwm-imx-tpm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)
367367

368368
tpm->chip.dev = &pdev->dev;
369369
tpm->chip.ops = &imx_tpm_pwm_ops;
370+
tpm->chip.of_xlate = of_pwm_xlate_with_flags;
371+
tpm->chip.of_pwm_n_cells = 3;
370372

371373
/* get number of channels */
372374
val = readl(tpm->base + PWM_IMX_TPM_PARAM);

0 commit comments

Comments
 (0)