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
Kirill Smelkov
linux
Commits
ab4e5744
Commit
ab4e5744
authored
Nov 24, 2010
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.37' into for-2.6.38
parents
2a9ae13a
d6f443ae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
sound/soc/codecs/wm8961.c
sound/soc/codecs/wm8961.c
+2
-2
sound/soc/nuc900/nuc900-ac97.c
sound/soc/nuc900/nuc900-ac97.c
+1
-1
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+8
-0
sound/soc/omap/omap3pandora.c
sound/soc/omap/omap3pandora.c
+1
-0
No files found.
sound/soc/codecs/wm8961.c
View file @
ab4e5744
...
...
@@ -710,7 +710,7 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
if
(
fs
<=
24000
)
reg
|=
WM8961_DACSLOPE
;
else
reg
&=
WM8961_DACSLOPE
;
reg
&=
~
WM8961_DACSLOPE
;
snd_soc_write
(
codec
,
WM8961_ADC_DAC_CONTROL_2
,
reg
);
return
0
;
...
...
@@ -735,7 +735,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
freq
/=
2
;
}
else
{
dev_dbg
(
codec
->
dev
,
"Using MCLK/1 for %dHz MCLK
\n
"
,
freq
);
reg
&=
WM8961_MCLKDIV
;
reg
&=
~
WM8961_MCLKDIV
;
}
snd_soc_write
(
codec
,
WM8961_CLOCKING1
,
reg
);
...
...
sound/soc/nuc900/nuc900-ac97.c
View file @
ab4e5744
...
...
@@ -384,7 +384,6 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
static
int
__devexit
nuc900_ac97_drvremove
(
struct
platform_device
*
pdev
)
{
snd_soc_unregister_dai
(
&
pdev
->
dev
);
clk_put
(
nuc900_ac97_data
->
clk
);
...
...
@@ -392,6 +391,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
release_mem_region
(
nuc900_ac97_data
->
res
->
start
,
resource_size
(
nuc900_ac97_data
->
res
));
kfree
(
nuc900_ac97_data
);
nuc900_ac97_data
=
NULL
;
return
0
;
...
...
sound/soc/omap/omap-mcbsp.c
View file @
ab4e5744
...
...
@@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
case
OMAP_MCBSP_CLKR_SRC_CLKR
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKR
);
break
;
case
OMAP_MCBSP_CLKR_SRC_CLKX
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKX
);
break
;
case
OMAP_MCBSP_FSR_SRC_FSR
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSR
);
break
;
case
OMAP_MCBSP_FSR_SRC_FSX
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSX
);
break
;
default:
...
...
sound/soc/omap/omap3pandora.c
View file @
ab4e5744
...
...
@@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void)
pr_err
(
PREFIX
"Failed to get DAC regulator from %s: %ld
\n
"
,
dev_name
(
&
omap3pandora_snd_device
->
dev
),
PTR_ERR
(
omap3pandora_dac_reg
));
ret
=
PTR_ERR
(
omap3pandora_dac_reg
);
goto
fail3
;
}
...
...
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