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>
This commit is contained in:

committed by
Samuel Ortiz

parent
20fb277250
commit
360e64d8bb
@@ -83,15 +83,12 @@
|
||||
#define UCB_ID 0x7e
|
||||
#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 gpio_chip gc;
|
||||
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 {
|
||||
@@ -110,6 +107,9 @@ struct ucb1400 {
|
||||
|
||||
struct ucb1400_pdata {
|
||||
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)
|
||||
@@ -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,
|
||||
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
|
||||
|
Reference in New Issue
Block a user