Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
d5fc3b5f
Commit
d5fc3b5f
authored
Jun 25, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.31' into for-2.6.32
parents
e2f551da
dd5e8e6b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
20 deletions
+30
-20
MAINTAINERS
MAINTAINERS
+7
-0
sound/soc/blackfin/bf5xx-i2s.c
sound/soc/blackfin/bf5xx-i2s.c
+7
-3
sound/soc/codecs/ssm2602.c
sound/soc/codecs/ssm2602.c
+0
-4
sound/soc/codecs/wm8903.c
sound/soc/codecs/wm8903.c
+0
-4
sound/soc/pxa/magician.c
sound/soc/pxa/magician.c
+1
-1
sound/soc/s3c24xx/neo1973_wm8753.c
sound/soc/s3c24xx/neo1973_wm8753.c
+10
-6
sound/soc/soc-core.c
sound/soc/soc-core.c
+3
-0
sound/soc/txx9/txx9aclc.c
sound/soc/txx9/txx9aclc.c
+2
-2
No files found.
MAINTAINERS
View file @
d5fc3b5f
...
...
@@ -5523,6 +5523,13 @@ M: dsaxena@plexity.net
S: Maintained
F: drivers/char/hw_random/omap-rng.c
TI TWL4030 SERIES SOC CODEC DRIVER
P: Peter Ujfalusi
M: peter.ujfalusi@nokia.com
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Maintained
F: sound/soc/codecs/twl4030*
TIPC NETWORK LAYER
P: Per Liden
M: per.liden@ericsson.com
...
...
sound/soc/blackfin/bf5xx-i2s.c
View file @
d5fc3b5f
...
...
@@ -50,6 +50,7 @@ struct bf5xx_i2s_port {
u16
tcr2
;
u16
rcr2
;
int
counter
;
int
configured
;
};
static
struct
bf5xx_i2s_port
bf5xx_i2s
;
...
...
@@ -168,7 +169,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
break
;
}
if
(
bf5xx_i2s
.
counter
==
1
)
{
if
(
!
bf5xx_i2s
.
configured
)
{
/*
* TX and RX are not independent,they are enabled at the
* same time, even if only one side is running. So, we
...
...
@@ -177,6 +178,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
*
* CPU DAI:slave mode.
*/
bf5xx_i2s
.
configured
=
1
;
ret
=
sport_config_rx
(
sport_handle
,
bf5xx_i2s
.
rcr1
,
bf5xx_i2s
.
rcr2
,
0
,
0
);
if
(
ret
)
{
...
...
@@ -200,6 +202,9 @@ static void bf5xx_i2s_shutdown(struct snd_pcm_substream *substream,
{
pr_debug
(
"%s enter
\n
"
,
__func__
);
bf5xx_i2s
.
counter
--
;
/* No active stream, SPORT is allowed to be configured again. */
if
(
!
bf5xx_i2s
.
counter
)
bf5xx_i2s
.
configured
=
0
;
}
static
int
bf5xx_i2s_probe
(
struct
platform_device
*
pdev
,
...
...
@@ -244,8 +249,7 @@ static int bf5xx_i2s_suspend(struct snd_soc_dai *dai)
return
0
;
}
static
int
bf5xx_i2s_resume
(
struct
platform_device
*
pdev
,
struct
snd_soc_dai
*
dai
)
static
int
bf5xx_i2s_resume
(
struct
snd_soc_dai
*
dai
)
{
int
ret
;
struct
sport_device
*
sport
=
...
...
sound/soc/codecs/ssm2602.c
View file @
d5fc3b5f
...
...
@@ -375,10 +375,6 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,
struct
snd_soc_codec
*
codec
=
socdev
->
card
->
codec
;
struct
ssm2602_priv
*
ssm2602
=
codec
->
private_data
;
if
(
ssm2602
->
master_substream
==
substream
)
ssm2602
->
master_substream
=
ssm2602
->
slave_substream
;
ssm2602
->
slave_substream
=
NULL
;
/* deactivate */
if
(
!
codec
->
active
)
ssm2602_write
(
codec
,
SSM2602_ACTIVE
,
0
);
...
...
sound/soc/codecs/wm8903.c
View file @
d5fc3b5f
...
...
@@ -1255,22 +1255,18 @@ static struct {
int
div
;
}
bclk_divs
[]
=
{
{
10
,
0
},
{
15
,
1
},
{
20
,
2
},
{
30
,
3
},
{
40
,
4
},
{
50
,
5
},
{
55
,
6
},
{
60
,
7
},
{
80
,
8
},
{
100
,
9
},
{
110
,
10
},
{
120
,
11
},
{
160
,
12
},
{
200
,
13
},
{
220
,
14
},
{
240
,
15
},
{
250
,
16
},
{
300
,
17
},
{
320
,
18
},
{
440
,
19
},
...
...
sound/soc/pxa/magician.c
View file @
d5fc3b5f
...
...
@@ -186,7 +186,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,
/* set cpu DAI configuration */
ret
=
snd_soc_dai_set_fmt
(
cpu_dai
,
SND_SOC_DAIFMT_DSP_A
|
SND_SOC_DAIFMT_
I
B_IF
|
SND_SOC_DAIFMT_CBS_CFS
);
SND_SOC_DAIFMT_
N
B_IF
|
SND_SOC_DAIFMT_CBS_CFS
);
if
(
ret
<
0
)
return
ret
;
...
...
sound/soc/s3c24xx/neo1973_wm8753.c
View file @
d5fc3b5f
...
...
@@ -345,9 +345,11 @@ static void lm4857_write_regs(void)
static
int
lm4857_get_reg
(
struct
snd_kcontrol
*
kcontrol
,
struct
snd_ctl_elem_value
*
ucontrol
)
{
int
reg
=
kcontrol
->
private_value
&
0xFF
;
int
shift
=
(
kcontrol
->
private_value
>>
8
)
&
0x0F
;
int
mask
=
(
kcontrol
->
private_value
>>
16
)
&
0xFF
;
struct
soc_mixer_control
*
mc
=
(
struct
soc_mixer_control
*
)
kcontrol
->
private_value
;
int
reg
=
mc
->
reg
;
int
shift
=
mc
->
shift
;
int
mask
=
mc
->
max
;
pr_debug
(
"Entered %s
\n
"
,
__func__
);
...
...
@@ -358,9 +360,11 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
static
int
lm4857_set_reg
(
struct
snd_kcontrol
*
kcontrol
,
struct
snd_ctl_elem_value
*
ucontrol
)
{
int
reg
=
kcontrol
->
private_value
&
0xFF
;
int
shift
=
(
kcontrol
->
private_value
>>
8
)
&
0x0F
;
int
mask
=
(
kcontrol
->
private_value
>>
16
)
&
0xFF
;
struct
soc_mixer_control
*
mc
=
(
struct
soc_mixer_control
*
)
kcontrol
->
private_value
;
int
reg
=
mc
->
reg
;
int
shift
=
mc
->
shift
;
int
mask
=
mc
->
max
;
if
(((
lm4857_regs
[
reg
]
>>
shift
)
&
mask
)
==
ucontrol
->
value
.
integer
.
value
[
0
])
...
...
sound/soc/soc-core.c
View file @
d5fc3b5f
...
...
@@ -1444,6 +1444,9 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
snprintf
(
codec
->
card
->
longname
,
sizeof
(
codec
->
card
->
longname
),
"%s (%s)"
,
card
->
name
,
codec
->
name
);
/* Make sure all DAPM widgets are instantiated */
snd_soc_dapm_new_widgets
(
codec
);
ret
=
snd_card_register
(
codec
->
card
);
if
(
ret
<
0
)
{
printk
(
KERN_ERR
"asoc: failed to register soundcard for %s
\n
"
,
...
...
sound/soc/txx9/txx9aclc.c
View file @
d5fc3b5f
...
...
@@ -297,9 +297,9 @@ static int txx9aclc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
static
bool
filter
(
struct
dma_chan
*
chan
,
void
*
param
)
{
struct
txx9aclc_dmadata
*
dmadata
=
param
;
char
devname
[
BUS_ID_SIZE
+
2
];
char
devname
[
20
+
2
];
/* FIXME: old BUS_ID_SIZE + 2 */
s
printf
(
devname
,
"%s.%d"
,
dmadata
->
dma_res
->
name
,
s
nprintf
(
devname
,
sizeof
(
devname
)
,
"%s.%d"
,
dmadata
->
dma_res
->
name
,
(
int
)
dmadata
->
dma_res
->
start
);
if
(
strcmp
(
dev_name
(
chan
->
device
->
dev
),
devname
)
==
0
)
{
chan
->
private
=
&
dmadata
->
dma_slave
;
...
...
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