Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops

Browse source 
Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Keerthy 2018-02-15 11:31:50 +05:30 • committed by Tony Lindgren
parent 1a3acad266
commit b7290cf6ff
1 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
drivers/pwm/pwm-omap-dmtimer.c
View file

@ -23,6 +23,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_data/dmtimer-omap.h>
#include <linux/platform_data/pwm_omap_dmtimer.h> #include <linux/platform_data/pwm_omap_dmtimer.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip {
struct pwm_chip chip; struct pwm_chip chip;
struct mutex mutex; struct mutex mutex;
pwm_omap_dmtimer *dm_timer; pwm_omap_dmtimer *dm_timer;
struct pwm_omap_dmtimer_pdata *pdata; const struct omap_dm_timer_ops *pdata;
struct platform_device *dm_timer_pdev; struct platform_device *dm_timer_pdev;
}; };
@ -242,19 +243,35 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *timer; struct device_node *timer;
struct platform_device *timer_pdev;
struct pwm_omap_dmtimer_chip *omap; struct pwm_omap_dmtimer_chip *omap;
struct pwm_omap_dmtimer_pdata *pdata; struct dmtimer_platform_data *timer_pdata;
const struct omap_dm_timer_ops *pdata;
pwm_omap_dmtimer *dm_timer; pwm_omap_dmtimer *dm_timer;
u32 v; u32 v;
int status; int ret = 0;
pdata = dev_get_platdata(&pdev->dev); timer = of_parse_phandle(np, "ti,timers", 0);
if (!pdata) { if (!timer)
dev_err(&pdev->dev, "Missing dmtimer platform data\n"); return -ENODEV;
return -EINVAL;
timer_pdev = of_find_device_by_node(timer);
if (!timer_pdev) {
dev_err(&pdev->dev, "Unable to find Timer pdev\n");
ret = -ENODEV;
goto put;
} }
if (!pdata->request_by_node || timer_pdata = dev_get_platdata(&timer_pdev->dev);
if (!timer_pdata) {
dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
ret = -EINVAL;
goto put;
}
pdata = timer_pdata->timer_ops;
if (!pdata || !pdata->request_by_node ||
!pdata->free || !pdata->free ||
!pdata->enable || !pdata->enable ||
!pdata->disable || !pdata->disable ||
@ -267,21 +284,26 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
!pdata->set_prescaler || !pdata->set_prescaler ||
!pdata->write_counter) { !pdata->write_counter) {
dev_err(&pdev->dev, "Incomplete dmtimer pdata structure\n"); dev_err(&pdev->dev, "Incomplete dmtimer pdata structure\n");
return -EINVAL; ret = -EINVAL;
goto put;
} }
timer = of_parse_phandle(np, "ti,timers", 0);
if (!timer)
return -ENODEV;
if (!of_get_property(timer, "ti,timer-pwm", NULL)) { if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n"); dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
return -ENODEV; ret = -ENODEV;
goto put;
} }
dm_timer = pdata->request_by_node(timer); dm_timer = pdata->request_by_node(timer);
if (!dm_timer) if (!dm_timer) {
return -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto put;
}
put:
of_node_put(timer);
if (ret < 0)
return ret;
omap = devm_kzalloc(&pdev->dev, sizeof(*omap), GFP_KERNEL); omap = devm_kzalloc(&pdev->dev, sizeof(*omap), GFP_KERNEL);
if (!omap) { if (!omap) {
@ -291,13 +313,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
omap->pdata = pdata; omap->pdata = pdata;
omap->dm_timer = dm_timer; omap->dm_timer = dm_timer;
omap->dm_timer_pdev = timer_pdev;
omap->dm_timer_pdev = of_find_device_by_node(timer);
if (!omap->dm_timer_pdev) {
dev_err(&pdev->dev, "Unable to find timer pdev\n");
omap->pdata->free(dm_timer);
return -EINVAL;
}
/* /*
* Ensure that the timer is stopped before we allow PWM core to call * Ensure that the timer is stopped before we allow PWM core to call
@ -322,11 +338,11 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
mutex_init(&omap->mutex); mutex_init(&omap->mutex);
status = pwmchip_add(&omap->chip); ret = pwmchip_add(&omap->chip);
if (status < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to register PWM\n"); dev_err(&pdev->dev, "failed to register PWM\n");
omap->pdata->free(omap->dm_timer); omap->pdata->free(omap->dm_timer);
return status; return ret;
} }
platform_set_drvdata(pdev, omap); platform_set_drvdata(pdev, omap);