aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_cs43xx.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-12-02 05:36:51 -0500
committerTakashi Iwai <tiwai@suse.de>2010-12-06 08:47:50 -0500
commitf7e4bad74e1b18aaff6e89cf2bc4a3868a6ba56e (patch)
treeac18eb17dc0e046c8661a5a946ac05bd6eecb677 /sound/pci/oxygen/xonar_cs43xx.c
parent28b26e15533e60970a014582d812d471ad63bcd0 (diff)
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: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/xonar_cs43xx.c')
-rw-r--r--sound/pci/oxygen/xonar_cs43xx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index aa27c31049a..ae4e5b51248 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -63,6 +63,7 @@
63#define GPI_EXT_POWER 0x01 63#define GPI_EXT_POWER 0x01
64#define GPIO_D1_OUTPUT_ENABLE 0x0001 64#define GPIO_D1_OUTPUT_ENABLE 0x0001
65#define GPIO_D1_FRONT_PANEL 0x0002 65#define GPIO_D1_FRONT_PANEL 0x0002
66#define GPIO_D1_MAGIC 0x00c0
66#define GPIO_D1_INPUT_ROUTE 0x0100 67#define GPIO_D1_INPUT_ROUTE 0x0100
67 68
68#define I2C_DEVICE_CS4398 0x9e /* 10011, AD1=1, AD0=1, /W=0 */ 69#define I2C_DEVICE_CS4398 0x9e /* 10011, AD1=1, AD0=1, /W=0 */
@@ -169,7 +170,9 @@ static void xonar_d1_init(struct oxygen *chip)
169 cs43xx_registers_init(chip); 170 cs43xx_registers_init(chip);
170 171
171 oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 172 oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
172 GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE); 173 GPIO_D1_FRONT_PANEL |
174 GPIO_D1_MAGIC |
175 GPIO_D1_INPUT_ROUTE);
173 oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, 176 oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
174 GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE); 177 GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
175 178