system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus

Browse source 
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>
This commit is contained in:
Marek Vasut 2013-04-14 20:35:48 +02:00 committed by Samuel Ortiz
parent 20fb277250
commit 360e64d8bb
3 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpio/gpio-ucb1400.c
View file

@ -12,8 +12,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/ucb1400.h> #include <linux/ucb1400.h>
struct ucb1400_gpio_data *ucbdata;
static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off) static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off)
{ {
struct ucb1400_gpio *gpio; struct ucb1400_gpio *gpio;
@ -50,7 +48,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
struct ucb1400_gpio *ucb = dev->dev.platform_data; struct ucb1400_gpio *ucb = dev->dev.platform_data;
int err = 0; int err = 0;
if (!(ucbdata && ucbdata->gpio_offset)) { if (!(ucb && ucb->gpio_offset)) {
err = -EINVAL; err = -EINVAL;
goto err; goto err;
} }
@ -58,7 +56,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
platform_set_drvdata(dev, ucb); platform_set_drvdata(dev, ucb);
ucb->gc.label = "ucb1400_gpio"; ucb->gc.label = "ucb1400_gpio";
ucb->gc.base = ucbdata->gpio_offset; ucb->gc.base = ucb->gpio_offset;
ucb->gc.ngpio = 10; ucb->gc.ngpio = 10;
ucb->gc.owner = THIS_MODULE; ucb->gc.owner = THIS_MODULE;
@ -72,8 +70,8 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
if (err) if (err)
goto err; goto err;
if (ucbdata && ucbdata->gpio_setup) if (ucb && ucb->gpio_setup)
err = ucbdata->gpio_setup(&dev->dev, ucb->gc.ngpio); err = ucb->gpio_setup(&dev->dev, ucb->gc.ngpio);
err: err:
return err; return err;
@ -85,8 +83,8 @@ static int ucb1400_gpio_remove(struct platform_device *dev)
int err = 0; int err = 0;
struct ucb1400_gpio *ucb = platform_get_drvdata(dev); struct ucb1400_gpio *ucb = platform_get_drvdata(dev);
if (ucbdata && ucbdata->gpio_teardown) { if (ucb && ucb->gpio_teardown) {
err = ucbdata->gpio_teardown(&dev->dev, ucb->gc.ngpio); err = ucb->gpio_teardown(&dev->dev, ucb->gc.ngpio);
if (err) if (err)
return err; return err;
} }
@ -103,11 +101,6 @@ static struct platform_driver ucb1400_gpio_driver = {
}, },
}; };
void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)
{
ucbdata = data;
}
module_platform_driver(ucb1400_gpio_driver); module_platform_driver(ucb1400_gpio_driver);
MODULE_DESCRIPTION("Philips UCB1400 GPIO driver"); MODULE_DESCRIPTION("Philips UCB1400 GPIO driver");

5
drivers/mfd/ucb1400_core.c
View file

@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev)
/* GPIO */ /* GPIO */
ucb_gpio.ac97 = ac97; 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); ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
if (!ucb->ucb1400_gpio) { if (!ucb->ucb1400_gpio) {
err = -ENOMEM; err = -ENOMEM;

18
include/linux/ucb1400.h
View file

@ -83,15 +83,12 @@
#define UCB_ID 0x7e #define UCB_ID 0x7e
#define UCB_ID_1400 0x4304 #define UCB_ID_1400 0x4304
struct ucb1400_gpio_data {
int gpio_offset;
int (*gpio_setup)(struct device *dev, int ngpio);
int (*gpio_teardown)(struct device *dev, int ngpio);
};
struct ucb1400_gpio { struct ucb1400_gpio {
struct gpio_chip gc; struct gpio_chip gc;
struct snd_ac97 *ac97; struct snd_ac97 *ac97;
int gpio_offset;
int (*gpio_setup)(struct device *dev, int ngpio);
int (*gpio_teardown)(struct device *dev, int ngpio);
}; };
struct ucb1400_ts { struct ucb1400_ts {
@ -110,6 +107,9 @@ struct ucb1400 {
struct ucb1400_pdata { struct ucb1400_pdata {
int irq; int irq;
int gpio_offset;
int (*gpio_setup)(struct device *dev, int ngpio);
int (*gpio_teardown)(struct device *dev, int ngpio);
}; };
static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg) static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
@ -162,10 +162,4 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
int adcsync); int adcsync);
#ifdef CONFIG_GPIO_UCB1400
void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data);
#else
static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {}
#endif
#endif #endif