Commit f7e4bad7 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: virtuoso: initialize unknown GPIO bits 



Initialize the configuration of some unknown GPIO output bits (that
might not be used at all) to be the same as in the Windows driver, just
to be sure.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 28b26e15

sound/pci/oxygen/xonar_cs43xx.c

+4 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#define GPI_EXT_POWER		0x01

#define GPIO_D1_OUTPUT_ENABLE	0x0001

#define GPIO_D1_FRONT_PANEL	0x0002

#define GPIO_D1_MAGIC		0x00c0

#define GPIO_D1_INPUT_ROUTE	0x0100



#define I2C_DEVICE_CS4398	0x9e	/* 10011, AD1=1, AD0=1, /W=0 */
@@ -169,7 +170,9 @@ static void xonar_d1_init(struct oxygen *chip) 
	cs43xx_registers_init(chip);



	oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,

			  GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);

			  GPIO_D1_FRONT_PANEL |

			  GPIO_D1_MAGIC |

			  GPIO_D1_INPUT_ROUTE);

	oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,

			    GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);

sound/pci/oxygen/xonar_pcm179x.c

+6 −2
Original line number Diff line number Diff line
@@ -167,12 +167,14 @@ 
#define GPIO_INPUT_ROUTE	0x0100



#define GPIO_HDAV_OUTPUT_ENABLE	0x0001

#define GPIO_HDAV_MAGIC		0x00c0



#define GPIO_DB_MASK		0x0030

#define GPIO_DB_H6		0x0000



#define GPIO_ST_OUTPUT_ENABLE	0x0001

#define GPIO_ST_HP_REAR		0x0002

#define GPIO_ST_MAGIC		0x0040

#define GPIO_ST_HP		0x0080



#define I2C_DEVICE_PCM1796(i)	(0x98 + ((i) << 1))	/* 10011, ii, /W=0 */
@@ -350,7 +352,8 @@ static void xonar_hdav_init(struct oxygen *chip) 


	pcm1796_init(chip);



	oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_INPUT_ROUTE);

	oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,

			  GPIO_HDAV_MAGIC | GPIO_INPUT_ROUTE);

	oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_INPUT_ROUTE);



	xonar_init_cs53x1(chip);
@@ -381,7 +384,8 @@ static void xonar_st_init_common(struct oxygen *chip) 
	pcm1796_init(chip);



	oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,

			  GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);

			  GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR |

			  GPIO_ST_MAGIC | GPIO_ST_HP);

	oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,

			    GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE