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
f1cc981b
Commit
f1cc981b
authored
Apr 12, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
parents
7d9ca53b
b692a436
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
16 deletions
+39
-16
sound/soc/codecs/ak4104.c
sound/soc/codecs/ak4104.c
+39
-16
No files found.
sound/soc/codecs/ak4104.c
View file @
f1cc981b
...
@@ -55,6 +55,7 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
...
@@ -55,6 +55,7 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned
int
format
)
unsigned
int
format
)
{
{
struct
snd_soc_codec
*
codec
=
codec_dai
->
codec
;
struct
snd_soc_codec
*
codec
=
codec_dai
->
codec
;
struct
ak4104_private
*
ak4104
=
snd_soc_codec_get_drvdata
(
codec
);
int
val
=
0
;
int
val
=
0
;
int
ret
;
int
ret
;
...
@@ -77,7 +78,7 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
...
@@ -77,7 +78,7 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
if
((
format
&
SND_SOC_DAIFMT_MASTER_MASK
)
!=
SND_SOC_DAIFMT_CBS_CFS
)
if
((
format
&
SND_SOC_DAIFMT_MASTER_MASK
)
!=
SND_SOC_DAIFMT_CBS_CFS
)
return
-
EINVAL
;
return
-
EINVAL
;
ret
=
snd_soc_update_bits
(
codec
,
AK4104_REG_CONTROL1
,
ret
=
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_CONTROL1
,
AK4104_CONTROL1_DIF0
|
AK4104_CONTROL1_DIF1
,
AK4104_CONTROL1_DIF0
|
AK4104_CONTROL1_DIF1
,
val
);
val
);
if
(
ret
<
0
)
if
(
ret
<
0
)
...
@@ -91,11 +92,12 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
...
@@ -91,11 +92,12 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
struct
snd_soc_dai
*
dai
)
struct
snd_soc_dai
*
dai
)
{
{
struct
snd_soc_codec
*
codec
=
dai
->
codec
;
struct
snd_soc_codec
*
codec
=
dai
->
codec
;
int
val
=
0
;
struct
ak4104_private
*
ak4104
=
snd_soc_codec_get_drvdata
(
codec
);
int
ret
,
val
=
0
;
/* set the IEC958 bits: consumer mode, no copyright bit */
/* set the IEC958 bits: consumer mode, no copyright bit */
val
|=
IEC958_AES0_CON_NOT_COPYRIGHT
;
val
|=
IEC958_AES0_CON_NOT_COPYRIGHT
;
snd_soc_write
(
codec
,
AK4104_REG_CHN_STATUS
(
0
),
val
);
regmap_write
(
ak4104
->
regmap
,
AK4104_REG_CHN_STATUS
(
0
),
val
);
val
=
0
;
val
=
0
;
...
@@ -132,11 +134,33 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
...
@@ -132,11 +134,33 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
return
-
EINVAL
;
return
-
EINVAL
;
}
}
return
snd_soc_write
(
codec
,
AK4104_REG_CHN_STATUS
(
3
),
val
);
ret
=
regmap_write
(
ak4104
->
regmap
,
AK4104_REG_CHN_STATUS
(
3
),
val
);
if
(
ret
<
0
)
return
ret
;
/* enable transmitter */
ret
=
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_TX
,
AK4104_TX_TXE
,
AK4104_TX_TXE
);
if
(
ret
<
0
)
return
ret
;
return
0
;
}
static
int
ak4104_hw_free
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
snd_soc_codec
*
codec
=
dai
->
codec
;
struct
ak4104_private
*
ak4104
=
snd_soc_codec_get_drvdata
(
codec
);
/* disable transmitter */
return
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_TX
,
AK4104_TX_TXE
,
0
);
}
}
static
const
struct
snd_soc_dai_ops
ak4101_dai_ops
=
{
static
const
struct
snd_soc_dai_ops
ak4101_dai_ops
=
{
.
hw_params
=
ak4104_hw_params
,
.
hw_params
=
ak4104_hw_params
,
.
hw_free
=
ak4104_hw_free
,
.
set_fmt
=
ak4104_set_dai_fmt
,
.
set_fmt
=
ak4104_set_dai_fmt
,
};
};
...
@@ -160,19 +184,16 @@ static int ak4104_probe(struct snd_soc_codec *codec)
...
@@ -160,19 +184,16 @@ static int ak4104_probe(struct snd_soc_codec *codec)
int
ret
;
int
ret
;
codec
->
control_data
=
ak4104
->
regmap
;
codec
->
control_data
=
ak4104
->
regmap
;
ret
=
snd_soc_codec_set_cache_io
(
codec
,
8
,
8
,
SND_SOC_REGMAP
);
if
(
ret
!=
0
)
return
ret
;
/* set power-up and non-reset bits */
/* set power-up and non-reset bits */
ret
=
snd_soc_update_bits
(
codec
,
AK4104_REG_CONTROL1
,
ret
=
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_CONTROL1
,
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
,
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
,
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
);
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
/* enable transmitter */
/* enable transmitter */
ret
=
snd_soc_update_bits
(
codec
,
AK4104_REG_TX
,
ret
=
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_TX
,
AK4104_TX_TXE
,
AK4104_TX_TXE
);
AK4104_TX_TXE
,
AK4104_TX_TXE
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
@@ -182,7 +203,9 @@ static int ak4104_probe(struct snd_soc_codec *codec)
...
@@ -182,7 +203,9 @@ static int ak4104_probe(struct snd_soc_codec *codec)
static
int
ak4104_remove
(
struct
snd_soc_codec
*
codec
)
static
int
ak4104_remove
(
struct
snd_soc_codec
*
codec
)
{
{
snd_soc_update_bits
(
codec
,
AK4104_REG_CONTROL1
,
struct
ak4104_private
*
ak4104
=
snd_soc_codec_get_drvdata
(
codec
);
regmap_update_bits
(
ak4104
->
regmap
,
AK4104_REG_CONTROL1
,
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
,
0
);
AK4104_CONTROL1_PW
|
AK4104_CONTROL1_RSTN
,
0
);
return
0
;
return
0
;
...
...
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