git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
[pandora-kernel.git]
/
sound
/
pci
/
oxygen
/
xonar_cs43xx.c
diff --git
a/sound/pci/oxygen/xonar_cs43xx.c
b/sound/pci/oxygen/xonar_cs43xx.c
index
16c226b
..
7c4986b
100644
(file)
--- a/
sound/pci/oxygen/xonar_cs43xx.c
+++ b/
sound/pci/oxygen/xonar_cs43xx.c
@@
-56,6
+56,7
@@
#include <sound/pcm_params.h>
#include <sound/tlv.h>
#include "xonar.h"
#include <sound/pcm_params.h>
#include <sound/tlv.h>
#include "xonar.h"
+#include "cm9780.h"
#include "cs4398.h"
#include "cs4362a.h"
#include "cs4398.h"
#include "cs4362a.h"
@@
-172,6
+173,8
@@
static void xonar_d1_init(struct oxygen *chip)
oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
+ oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+
xonar_init_cs53x1(chip);
xonar_enable_output(chip);
xonar_init_cs53x1(chip);
xonar_enable_output(chip);