summaryrefslogtreecommitdiff
path: root/drivers/mfd/ucb1400_core.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-04-14 22:35:48 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-19 02:40:07 +0400
commit360e64d8bbe7c78784d769a60d152804f5079577 (patch)
tree44a1e15f1551d348a6492d997c310a114d78e943 /drivers/mfd/ucb1400_core.c
parent20fb277250816d6c3ff326552be0fea4173fd8ca (diff)
downloadlinux-360e64d8bbe7c78784d769a60d152804f5079577.tar.xz
mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
Cc: Jean Delvare <jdelvare@suse.de> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Grant Likely <grant.likely@secretlab.ca> Acked-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ucb1400_core.c')
-rw-r--r--drivers/mfd/ucb1400_core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index daf69527ed83..e9031fa9d53d 100644
--- a/drivers/mfd/ucb1400_core.c
+++ b/drivers/mfd/ucb1400_core.c
@@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev)
/* GPIO */
ucb_gpio.ac97 = ac97;
+ if (pdata) {
+ ucb_gpio.gpio_setup = pdata->gpio_setup;
+ ucb_gpio.gpio_teardown = pdata->gpio_teardown;
+ ucb_gpio.gpio_offset = pdata->gpio_offset;
+ }
ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
if (!ucb->ucb1400_gpio) {
err = -ENOMEM;