Commit 49470306 authored by Pavel Hofman's avatar Pavel Hofman Committed by Takashi Iwai
Browse files

ALSA: ice1724 - adding GPIO routines for mask and direction 



* get/set routines for GPIO mask and direction

Signed-off-by: default avatarPavel Hofman <pavel.hofman@ivitera.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 42cfa276

sound/pci/ice1712/ice1712.c

+12 −0
Original line number Diff line number Diff line
@@ -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;

sound/pci/ice1712/ice1712.h

+7 −0
Original line number Diff line number Diff line
@@ -359,7 +359,9 @@ struct snd_ice1712 { 
		unsigned int saved[2];		/* for ewx_i2c */

		/* operators */

		void (*set_mask)(struct snd_ice1712 *ice, unsigned int data);

		unsigned int (*get_mask)(struct snd_ice1712 *ice);

		void (*set_dir)(struct snd_ice1712 *ice, unsigned int data);

		unsigned int (*get_dir)(struct snd_ice1712 *ice);

		void (*set_data)(struct snd_ice1712 *ice, unsigned int data);

		unsigned int (*get_data)(struct snd_ice1712 *ice);

		/* misc operators - move to another place? */
@@ -399,6 +401,11 @@ static inline void snd_ice1712_gpio_set_dir(struct snd_ice1712 *ice, unsigned in 
	ice->gpio.set_dir(ice, bits);

}



static inline unsigned int snd_ice1712_gpio_get_dir(struct snd_ice1712 *ice)

{

	return ice->gpio.get_dir(ice);

}



static inline void snd_ice1712_gpio_set_mask(struct snd_ice1712 *ice, unsigned int bits)

{

	ice->gpio.set_mask(ice, bits);

sound/pci/ice1712/ice1724.c

+19 −0
Original line number Diff line number Diff line
@@ -196,6 +196,12 @@ static void snd_vt1724_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data) 
	inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */

}



/* get gpio direction 0 = read, 1 = write */

static unsigned int snd_vt1724_get_gpio_dir(struct snd_ice1712 *ice)

{

	return inl(ICEREG1724(ice, GPIO_DIRECTION));

}



/* set the gpio mask (0 = writable) */

static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)

{
@@ -205,6 +211,17 @@ static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data) 
	inw(ICEREG1724(ice, GPIO_WRITE_MASK)); /* dummy read for pci-posting */

}



static unsigned int snd_vt1724_get_gpio_mask(struct snd_ice1712 *ice)

{

	unsigned int mask;

	if (!ice->vt1720)

		mask = (unsigned int)inb(ICEREG1724(ice, GPIO_WRITE_MASK_22));

	else

		mask = 0;

	mask = (mask << 16) | inw(ICEREG1724(ice, GPIO_WRITE_MASK));

	return mask;

}



static void snd_vt1724_set_gpio_data(struct snd_ice1712 *ice, unsigned int data)

{

	outw(data, ICEREG1724(ice, GPIO_DATA));
@@ -2434,7 +2451,9 @@ static int __devinit snd_vt1724_create(struct snd_card *card, 
	mutex_init(&ice->open_mutex);

	mutex_init(&ice->i2c_mutex);

	ice->gpio.set_mask = snd_vt1724_set_gpio_mask;

	ice->gpio.get_mask = snd_vt1724_get_gpio_mask;

	ice->gpio.set_dir = snd_vt1724_set_gpio_dir;

	ice->gpio.get_dir = snd_vt1724_get_gpio_dir;

	ice->gpio.set_data = snd_vt1724_set_gpio_data;

	ice->gpio.get_data = snd_vt1724_get_gpio_data;

	ice->card = card;