Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / drivers / pwm / pwm-omap-dmtimer.c

diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
index 3e95090..5ad42f3 100644 (file)
--- a/drivers/pwm/pwm-omap-dmtimer.c
+++ b/drivers/pwm/pwm-omap-dmtimer.c
@@ -245,7 +245,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
        struct pwm_omap_dmtimer_chip *omap;
        struct pwm_omap_dmtimer_pdata *pdata;
        pwm_omap_dmtimer *dm_timer;
-       u32 prescaler;
+       u32 v;
        int status;
 
        pdata = dev_get_platdata(&pdev->dev);
@@ -306,10 +306,12 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
        if (pm_runtime_active(&omap->dm_timer_pdev->dev))
                omap->pdata->stop(omap->dm_timer);
 
-       /* setup dmtimer prescaler */
-       if (!of_property_read_u32(pdev->dev.of_node, "ti,prescaler",
-                               &prescaler))
-               omap->pdata->set_prescaler(omap->dm_timer, prescaler);
+       if (!of_property_read_u32(pdev->dev.of_node, "ti,prescaler", &v))
+               omap->pdata->set_prescaler(omap->dm_timer, v);
+
+       /* setup dmtimer clock source */
+       if (!of_property_read_u32(pdev->dev.of_node, "ti,clock-source", &v))
+               omap->pdata->set_source(omap->dm_timer, v);
 
        omap->chip.dev = &pdev->dev;
        omap->chip.ops = &pwm_omap_dmtimer_ops;