diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-06-26 00:25:35 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-06-26 16:57:31 +0200 |
| commit | 8d080f5605c92508a73adcf45f872dd54312febb (patch) | |
| tree | 84f7eb1a5ff2d55ec77acf49384c0a99039545e5 | |
| parent | 8fb60e40bdc23f09578fb890de56f79d4781eb87 (diff) | |
| download | kernel_goldelico_gta04-8d080f5605c92508a73adcf45f872dd54312febb.zip kernel_goldelico_gta04-8d080f5605c92508a73adcf45f872dd54312febb.tar.gz kernel_goldelico_gta04-8d080f5605c92508a73adcf45f872dd54312febb.tar.bz2 | |
OMAP PWM: Mux init platform data call
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| -rw-r--r-- | drivers/pwm/pwm-omap.c | 6 | ||||
| -rw-r--r-- | include/linux/platform_data/omap-pwm.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-omap.c b/drivers/pwm/pwm-omap.c index 25605d0..7a74324 100644 --- a/drivers/pwm/pwm-omap.c +++ b/drivers/pwm/pwm-omap.c @@ -166,6 +166,12 @@ static int omap_pwm_probe(struct platform_device *pdev) return -ENOMEM; } + if (pdata->mux_init != NULL) { + status = pdata->mux_init(); + if (status < 0) + goto err_free; + } + /* * Request the OMAP dual-mode timer that will be bound to and * associated with this generic PWM. diff --git a/include/linux/platform_data/omap-pwm.h b/include/linux/platform_data/omap-pwm.h index 169fc3c..ed78fe3 100644 --- a/include/linux/platform_data/omap-pwm.h +++ b/include/linux/platform_data/omap-pwm.h @@ -15,6 +15,7 @@ struct omap_pwm_pdata { int timer_id; + int (*mux_init)(void); }; #endif /* _OMAP_PWM_H_ */ |