diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:57:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:57:01 +0100 |
| commit | 980f31c46b3c7895ad926fbb43c8edac6ce193ff (patch) | |
| tree | ec61a87b42ce8e6eb24554d8a56173ef75aefdd2 /sound/pci/ice1712/ice1712.c | |
| parent | 9e298f449e667833c4cafad040ce8025a8ba1eed (diff) | |
| parent | 6ef80706184be792499a4485a7957f2660b6a076 (diff) | |
| download | op-kernel-dev-980f31c46b3c7895ad926fbb43c8edac6ce193ff.zip op-kernel-dev-980f31c46b3c7895ad926fbb43c8edac6ce193ff.tar.gz | |
Merge branch 'topic/ice1724-quartet' into topic/hda
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index d74033a..c7cff6f 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -298,6 +298,16 @@ static void snd_ice1712_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data) inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */ } +static unsigned int snd_ice1712_get_gpio_dir(struct snd_ice1712 *ice) +{ + return snd_ice1712_read(ice, ICE1712_IREG_GPIO_DIRECTION); +} + +static unsigned int snd_ice1712_get_gpio_mask(struct snd_ice1712 *ice) +{ + return snd_ice1712_read(ice, ICE1712_IREG_GPIO_WRITE_MASK); +} + static void snd_ice1712_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data) { snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, data); @@ -2557,7 +2567,9 @@ static int __devinit snd_ice1712_create(struct snd_card *card, mutex_init(&ice->i2c_mutex); mutex_init(&ice->open_mutex); ice->gpio.set_mask = snd_ice1712_set_gpio_mask; + ice->gpio.get_mask = snd_ice1712_get_gpio_mask; ice->gpio.set_dir = snd_ice1712_set_gpio_dir; + ice->gpio.get_dir = snd_ice1712_get_gpio_dir; ice->gpio.set_data = snd_ice1712_set_gpio_data; ice->gpio.get_data = snd_ice1712_get_gpio_data; |
