Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
11be6a26
Commit
11be6a26
authored
Feb 26, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
4dfb8a45
43c63188
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
233 additions
and
45 deletions
+233
-45
include/sound/wm8903.h
include/sound/wm8903.h
+3
-7
sound/soc/codecs/cx20442.c
sound/soc/codecs/cx20442.c
+1
-1
sound/soc/codecs/wm8903.c
sound/soc/codecs/wm8903.c
+1
-1
sound/soc/codecs/wm8903.h
sound/soc/codecs/wm8903.h
+1
-1
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+185
-17
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c
+3
-0
sound/soc/imx/eukrea-tlv320.c
sound/soc/imx/eukrea-tlv320.c
+1
-1
sound/soc/pxa/e740_wm9705.c
sound/soc/pxa/e740_wm9705.c
+2
-2
sound/soc/pxa/e750_wm9705.c
sound/soc/pxa/e750_wm9705.c
+2
-2
sound/soc/pxa/e800_wm9712.c
sound/soc/pxa/e800_wm9712.c
+2
-2
sound/soc/pxa/em-x270.c
sound/soc/pxa/em-x270.c
+2
-2
sound/soc/pxa/mioa701_wm9713.c
sound/soc/pxa/mioa701_wm9713.c
+2
-2
sound/soc/pxa/palm27x.c
sound/soc/pxa/palm27x.c
+2
-2
sound/soc/pxa/tosa.c
sound/soc/pxa/tosa.c
+2
-2
sound/soc/pxa/zylonite.c
sound/soc/pxa/zylonite.c
+2
-2
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+22
-1
No files found.
include/sound/wm8903.h
View file @
11be6a26
...
...
@@ -17,13 +17,9 @@
/*
* R6 (0x06) - Mic Bias Control 0
*/
#define WM8903_MICDET_HYST_ENA 0x0080
/* MICDET_HYST_ENA */
#define WM8903_MICDET_HYST_ENA_MASK 0x0080
/* MICDET_HYST_ENA */
#define WM8903_MICDET_HYST_ENA_SHIFT 7
/* MICDET_HYST_ENA */
#define WM8903_MICDET_HYST_ENA_WIDTH 1
/* MICDET_HYST_ENA */
#define WM8903_MICDET_THR_MASK 0x0070
/* MICDET_THR - [6:4] */
#define WM8903_MICDET_THR_SHIFT 4
/* MICDET_THR - [6:4] */
#define WM8903_MICDET_THR_WIDTH 3
/* MICDET_THR - [6:4] */
#define WM8903_MICDET_THR_MASK 0x0030
/* MICDET_THR - [5:4] */
#define WM8903_MICDET_THR_SHIFT 4
/* MICDET_THR - [5:4] */
#define WM8903_MICDET_THR_WIDTH 2
/* MICDET_THR - [5:4] */
#define WM8903_MICSHORT_THR_MASK 0x000C
/* MICSHORT_THR - [3:2] */
#define WM8903_MICSHORT_THR_SHIFT 2
/* MICSHORT_THR - [3:2] */
#define WM8903_MICSHORT_THR_WIDTH 2
/* MICSHORT_THR - [3:2] */
...
...
sound/soc/codecs/cx20442.c
View file @
11be6a26
...
...
@@ -367,7 +367,7 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
return
0
;
}
static
const
u8
cx20442_reg
=
CX20442_TELOUT
|
CX20442_MIC
;
static
const
u8
cx20442_reg
;
static
struct
snd_soc_codec_driver
cx20442_codec_dev
=
{
.
probe
=
cx20442_codec_probe
,
...
...
sound/soc/codecs/wm8903.c
View file @
11be6a26
...
...
@@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
WM8903_MICDET_EINT
|
WM8903_MICSHRT_EINT
,
irq_mask
);
if
(
det
&&
shrt
)
{
if
(
det
||
shrt
)
{
/* Enable mic detection, this may not have been set through
* platform data (eg, if the defaults are OK). */
snd_soc_update_bits
(
codec
,
WM8903_WRITE_SEQUENCER_0
,
...
...
sound/soc/codecs/wm8903.h
View file @
11be6a26
...
...
@@ -165,7 +165,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec,
#define WM8903_VMID_RES_50K 2
#define WM8903_VMID_RES_250K 3
#define WM8903_VMID_RES_5K
4
#define WM8903_VMID_RES_5K
6
/*
* R8 (0x08) - Analogue DAC 0
...
...
sound/soc/codecs/wm8994.c
View file @
11be6a26
This diff is collapsed.
Click to expand it.
sound/soc/codecs/wm_hubs.c
View file @
11be6a26
...
...
@@ -674,6 +674,9 @@ SND_SOC_DAPM_OUTPUT("LINEOUT2N"),
};
static
const
struct
snd_soc_dapm_route
analogue_routes
[]
=
{
{
"MICBIAS1"
,
NULL
,
"CLK_SYS"
},
{
"MICBIAS2"
,
NULL
,
"CLK_SYS"
},
{
"IN1L PGA"
,
"IN1LP Switch"
,
"IN1LP"
},
{
"IN1L PGA"
,
"IN1LN Switch"
,
"IN1LN"
},
...
...
sound/soc/imx/eukrea-tlv320.c
View file @
11be6a26
...
...
@@ -79,7 +79,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = {
.
name
=
"tlv320aic23"
,
.
stream_name
=
"TLV320AIC23"
,
.
codec_dai_name
=
"tlv320aic23-hifi"
,
.
platform_name
=
"imx-pcm-audio.0"
,
.
platform_name
=
"imx-
fiq-
pcm-audio.0"
,
.
codec_name
=
"tlv320aic23-codec.0-001a"
,
.
cpu_dai_name
=
"imx-ssi.0"
,
.
ops
=
&
eukrea_tlv320_snd_ops
,
...
...
sound/soc/pxa/e740_wm9705.c
View file @
11be6a26
...
...
@@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9705-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9705-codec"
,
...
...
@@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9705-aux"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9705-codec"
,
...
...
sound/soc/pxa/e750_wm9705.c
View file @
11be6a26
...
...
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9705-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9705-codec"
,
...
...
@@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9705-aux"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9705-codec"
,
...
...
sound/soc/pxa/e800_wm9712.c
View file @
11be6a26
...
...
@@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
@@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
sound/soc/pxa/em-x270.c
View file @
11be6a26
...
...
@@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
@@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
sound/soc/pxa/mioa701_wm9713.c
View file @
11be6a26
...
...
@@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9713-hifi"
,
.
codec_name
=
"wm9713-codec"
,
.
init
=
mioa701_wm9713_init
,
...
...
@@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9713-aux"
,
.
codec_name
=
"wm9713-codec"
,
.
platform_name
=
"pxa-pcm-audio"
,
...
...
sound/soc/pxa/palm27x.c
View file @
11be6a26
...
...
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
{
.
name
=
"AC97 HiFi"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
codec_name
=
"wm9712-codec"
,
.
platform_name
=
"pxa-pcm-audio"
,
...
...
@@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
codec_name
=
"wm9712-codec"
,
.
platform_name
=
"pxa-pcm-audio"
,
...
...
sound/soc/pxa/tosa.c
View file @
11be6a26
...
...
@@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
{
.
name
=
"AC97"
,
.
stream_name
=
"AC97 HiFi"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
@@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
{
.
name
=
"AC97 Aux"
,
.
stream_name
=
"AC97 Aux"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm9712-codec"
,
...
...
sound/soc/pxa/zylonite.c
View file @
11be6a26
...
...
@@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.
stream_name
=
"AC97 HiFi"
,
.
codec_name
=
"wm9713-codec"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
cpu_dai_name
=
"pxa
-ac97.0
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97
"
,
.
codec_name
=
"wm9713-hifi"
,
.
init
=
zylonite_wm9713_init
,
},
...
...
@@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.
stream_name
=
"AC97 Aux"
,
.
codec_name
=
"wm9713-codec"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
cpu_dai_name
=
"pxa
-ac97.1
"
,
.
cpu_dai_name
=
"pxa
2xx-ac97-aux
"
,
.
codec_name
=
"wm9713-aux"
,
},
{
...
...
sound/soc/soc-dapm.c
View file @
11be6a26
...
...
@@ -712,7 +712,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
!
path
->
connected
(
path
->
source
,
path
->
sink
))
continue
;
if
(
path
->
sink
&&
path
->
sink
->
power_check
&&
if
(
!
path
->
sink
)
continue
;
if
(
path
->
sink
->
force
)
{
power
=
1
;
break
;
}
if
(
path
->
sink
->
power_check
&&
path
->
sink
->
power_check
(
path
->
sink
))
{
power
=
1
;
break
;
...
...
@@ -1627,6 +1635,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes);
int
snd_soc_dapm_new_widgets
(
struct
snd_soc_dapm_context
*
dapm
)
{
struct
snd_soc_dapm_widget
*
w
;
unsigned
int
val
;
list_for_each_entry
(
w
,
&
dapm
->
card
->
widgets
,
list
)
{
...
...
@@ -1675,6 +1684,18 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
case
snd_soc_dapm_post
:
break
;
}
/* Read the initial power state from the device */
if
(
w
->
reg
>=
0
)
{
val
=
snd_soc_read
(
w
->
codec
,
w
->
reg
);
val
&=
1
<<
w
->
shift
;
if
(
w
->
invert
)
val
=
!
val
;
if
(
val
)
w
->
power
=
1
;
}
w
->
new
=
1
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment