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
24a6703a
Commit
24a6703a
authored
Oct 24, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
parents
3cabd442
4d208ca4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
71 deletions
+30
-71
sound/soc/codecs/tlv320aic32x4.c
sound/soc/codecs/tlv320aic32x4.c
+30
-71
No files found.
sound/soc/codecs/tlv320aic32x4.c
View file @
24a6703a
...
@@ -60,9 +60,8 @@ struct aic32x4_rate_divs {
...
@@ -60,9 +60,8 @@ struct aic32x4_rate_divs {
};
};
struct
aic32x4_priv
{
struct
aic32x4_priv
{
struct
regmap
*
regmap
;
u32
sysclk
;
u32
sysclk
;
u8
page_no
;
void
*
control_data
;
u32
power_cfg
;
u32
power_cfg
;
u32
micpga_routing
;
u32
micpga_routing
;
bool
swapdacs
;
bool
swapdacs
;
...
@@ -262,67 +261,25 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
...
@@ -262,67 +261,25 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
{
"Right ADC"
,
NULL
,
"Right Input Mixer"
},
{
"Right ADC"
,
NULL
,
"Right Input Mixer"
},
};
};
static
inline
int
aic32x4_change_page
(
struct
snd_soc_codec
*
codec
,
static
const
struct
regmap_range_cfg
aic32x4_regmap_pages
[]
=
{
unsigned
int
new_page
)
{
{
.
selector_reg
=
0
,
struct
aic32x4_priv
*
aic32x4
=
snd_soc_codec_get_drvdata
(
codec
);
.
selector_mask
=
0xff
,
u8
data
[
2
];
.
window_start
=
0
,
int
ret
;
.
window_len
=
128
,
.
range_min
=
AIC32X4_PAGE1
,
data
[
0
]
=
0x00
;
.
range_max
=
AIC32X4_PAGE1
+
127
,
data
[
1
]
=
new_page
&
0xff
;
},
};
ret
=
codec
->
hw_write
(
codec
->
control_data
,
data
,
2
);
if
(
ret
==
2
)
{
aic32x4
->
page_no
=
new_page
;
return
0
;
}
else
{
return
ret
;
}
}
static
int
aic32x4_write
(
struct
snd_soc_codec
*
codec
,
unsigned
int
reg
,
unsigned
int
val
)
{
struct
aic32x4_priv
*
aic32x4
=
snd_soc_codec_get_drvdata
(
codec
);
unsigned
int
page
=
reg
/
128
;
unsigned
int
fixed_reg
=
reg
%
128
;
u8
data
[
2
];
int
ret
;
/* A write to AIC32X4_PSEL is really a non-explicit page change */
if
(
reg
==
AIC32X4_PSEL
)
return
aic32x4_change_page
(
codec
,
val
);
if
(
aic32x4
->
page_no
!=
page
)
{
ret
=
aic32x4_change_page
(
codec
,
page
);
if
(
ret
!=
0
)
return
ret
;
}
data
[
0
]
=
fixed_reg
&
0xff
;
data
[
1
]
=
val
&
0xff
;
if
(
codec
->
hw_write
(
codec
->
control_data
,
data
,
2
)
==
2
)
return
0
;
else
return
-
EIO
;
}
static
unsigned
int
aic32x4_read
(
struct
snd_soc_codec
*
codec
,
unsigned
int
reg
)
static
const
struct
regmap_config
aic32x4_regmap
=
{
{
.
reg_bits
=
8
,
struct
aic32x4_priv
*
aic32x4
=
snd_soc_codec_get_drvdata
(
codec
);
.
val_bits
=
8
,
unsigned
int
page
=
reg
/
128
;
unsigned
int
fixed_reg
=
reg
%
128
;
int
ret
;
if
(
aic32x4
->
page_no
!=
page
)
{
.
max_register
=
AIC32X4_RMICPGAVOL
,
ret
=
aic32x4_change_page
(
codec
,
page
);
.
ranges
=
aic32x4_regmap_pages
,
if
(
ret
!=
0
)
.
num_ranges
=
ARRAY_SIZE
(
aic32x4_regmap_pages
),
return
ret
;
};
}
return
i2c_smbus_read_byte_data
(
codec
->
control_data
,
fixed_reg
&
0xff
);
}
static
inline
int
aic32x4_get_divs
(
int
mclk
,
int
rate
)
static
inline
int
aic32x4_get_divs
(
int
mclk
,
int
rate
)
{
{
...
@@ -617,16 +574,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
...
@@ -617,16 +574,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
{
{
struct
aic32x4_priv
*
aic32x4
=
snd_soc_codec_get_drvdata
(
codec
);
struct
aic32x4_priv
*
aic32x4
=
snd_soc_codec_get_drvdata
(
codec
);
u32
tmp_reg
;
u32
tmp_reg
;
int
ret
;
codec
->
hw_write
=
(
hw_write_t
)
i2c_master_send
;
snd_soc_codec_set_cache_io
(
codec
,
8
,
8
,
SND_SOC_REGMAP
);
codec
->
control_data
=
aic32x4
->
control_data
;
if
(
aic32x4
->
rstn_gpio
>=
0
)
{
if
(
aic32x4
->
rstn_gpio
>=
0
)
{
ret
=
devm_gpio_request_one
(
codec
->
dev
,
aic32x4
->
rstn_gpio
,
GPIOF_OUT_INIT_LOW
,
"tlv320aic32x4 rstn"
);
if
(
ret
!=
0
)
return
ret
;
ndelay
(
10
);
ndelay
(
10
);
gpio_set_value
(
aic32x4
->
rstn_gpio
,
1
);
gpio_set_value
(
aic32x4
->
rstn_gpio
,
1
);
}
}
...
@@ -692,8 +643,6 @@ static int aic32x4_remove(struct snd_soc_codec *codec)
...
@@ -692,8 +643,6 @@ static int aic32x4_remove(struct snd_soc_codec *codec)
}
}
static
struct
snd_soc_codec_driver
soc_codec_dev_aic32x4
=
{
static
struct
snd_soc_codec_driver
soc_codec_dev_aic32x4
=
{
.
read
=
aic32x4_read
,
.
write
=
aic32x4_write
,
.
probe
=
aic32x4_probe
,
.
probe
=
aic32x4_probe
,
.
remove
=
aic32x4_remove
,
.
remove
=
aic32x4_remove
,
.
suspend
=
aic32x4_suspend
,
.
suspend
=
aic32x4_suspend
,
...
@@ -720,7 +669,10 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
...
@@ -720,7 +669,10 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
if
(
aic32x4
==
NULL
)
if
(
aic32x4
==
NULL
)
return
-
ENOMEM
;
return
-
ENOMEM
;
aic32x4
->
control_data
=
i2c
;
aic32x4
->
regmap
=
devm_regmap_init_i2c
(
i2c
,
&
aic32x4_regmap
);
if
(
IS_ERR
(
aic32x4
->
regmap
))
return
PTR_ERR
(
aic32x4
->
regmap
);
i2c_set_clientdata
(
i2c
,
aic32x4
);
i2c_set_clientdata
(
i2c
,
aic32x4
);
if
(
pdata
)
{
if
(
pdata
)
{
...
@@ -735,6 +687,13 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
...
@@ -735,6 +687,13 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
aic32x4
->
rstn_gpio
=
-
1
;
aic32x4
->
rstn_gpio
=
-
1
;
}
}
if
(
aic32x4
->
rstn_gpio
>=
0
)
{
ret
=
devm_gpio_request_one
(
&
i2c
->
dev
,
aic32x4
->
rstn_gpio
,
GPIOF_OUT_INIT_LOW
,
"tlv320aic32x4 rstn"
);
if
(
ret
!=
0
)
return
ret
;
}
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
&
soc_codec_dev_aic32x4
,
&
aic32x4_dai
,
1
);
&
soc_codec_dev_aic32x4
,
&
aic32x4_dai
,
1
);
return
ret
;
return
ret
;
...
...
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