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
2fc175c4
Commit
2fc175c4
authored
Nov 08, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next
parents
aff79f82
e54cf76b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
0 deletions
+19
-0
include/sound/soc-dai.h
include/sound/soc-dai.h
+3
-0
sound/soc/soc-core.c
sound/soc/soc-core.c
+16
-0
No files found.
include/sound/soc-dai.h
View file @
2fc175c4
...
@@ -105,6 +105,8 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
...
@@ -105,6 +105,8 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
int
snd_soc_dai_set_pll
(
struct
snd_soc_dai
*
dai
,
int
snd_soc_dai_set_pll
(
struct
snd_soc_dai
*
dai
,
int
pll_id
,
int
source
,
unsigned
int
freq_in
,
unsigned
int
freq_out
);
int
pll_id
,
int
source
,
unsigned
int
freq_in
,
unsigned
int
freq_out
);
int
snd_soc_dai_set_bclk_ratio
(
struct
snd_soc_dai
*
dai
,
unsigned
int
ratio
);
/* Digital Audio interface formatting */
/* Digital Audio interface formatting */
int
snd_soc_dai_set_fmt
(
struct
snd_soc_dai
*
dai
,
unsigned
int
fmt
);
int
snd_soc_dai_set_fmt
(
struct
snd_soc_dai
*
dai
,
unsigned
int
fmt
);
...
@@ -131,6 +133,7 @@ struct snd_soc_dai_ops {
...
@@ -131,6 +133,7 @@ struct snd_soc_dai_ops {
int
(
*
set_pll
)(
struct
snd_soc_dai
*
dai
,
int
pll_id
,
int
source
,
int
(
*
set_pll
)(
struct
snd_soc_dai
*
dai
,
int
pll_id
,
int
source
,
unsigned
int
freq_in
,
unsigned
int
freq_out
);
unsigned
int
freq_in
,
unsigned
int
freq_out
);
int
(
*
set_clkdiv
)(
struct
snd_soc_dai
*
dai
,
int
div_id
,
int
div
);
int
(
*
set_clkdiv
)(
struct
snd_soc_dai
*
dai
,
int
div_id
,
int
div
);
int
(
*
set_bclk_ratio
)(
struct
snd_soc_dai
*
dai
,
unsigned
int
ratio
);
/*
/*
* DAI format configuration
* DAI format configuration
...
...
sound/soc/soc-core.c
View file @
2fc175c4
...
@@ -3575,6 +3575,22 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
...
@@ -3575,6 +3575,22 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
}
}
EXPORT_SYMBOL_GPL
(
snd_soc_codec_set_pll
);
EXPORT_SYMBOL_GPL
(
snd_soc_codec_set_pll
);
/**
* snd_soc_dai_set_bclk_ratio - configure BCLK to sample rate ratio.
* @dai: DAI
* @ratio Ratio of BCLK to Sample rate.
*
* Configures the DAI for a preset BCLK to sample rate ratio.
*/
int
snd_soc_dai_set_bclk_ratio
(
struct
snd_soc_dai
*
dai
,
unsigned
int
ratio
)
{
if
(
dai
->
driver
&&
dai
->
driver
->
ops
->
set_bclk_ratio
)
return
dai
->
driver
->
ops
->
set_bclk_ratio
(
dai
,
ratio
);
else
return
-
EINVAL
;
}
EXPORT_SYMBOL_GPL
(
snd_soc_dai_set_bclk_ratio
);
/**
/**
* snd_soc_dai_set_fmt - configure DAI hardware audio format.
* snd_soc_dai_set_fmt - configure DAI hardware audio format.
* @dai: DAI
* @dai: DAI
...
...
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