Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
e0295300
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e0295300
编写于
11月 08, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next
上级
d4af6be4
4aa11d67
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
50 deletion
+34
-50
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/tlv320aic23.c
+34
-50
未找到文件。
sound/soc/codecs/tlv320aic23.c
浏览文件 @
e0295300
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
#include <linux/delay.h>
#include <linux/delay.h>
#include <linux/pm.h>
#include <linux/pm.h>
#include <linux/i2c.h>
#include <linux/i2c.h>
#include <linux/regmap.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm.h>
...
@@ -37,11 +38,27 @@
...
@@ -37,11 +38,27 @@
/*
/*
* AIC23 register cache
* AIC23 register cache
*/
*/
static
const
u16
tlv320aic23_reg
[]
=
{
static
const
struct
reg_default
tlv320aic23_reg
[]
=
{
0x0097
,
0x0097
,
0x00F9
,
0x00F9
,
/* 0 */
{
0
,
0x0097
},
0x001A
,
0x0004
,
0x0007
,
0x0001
,
/* 4 */
{
1
,
0x0097
},
0x0020
,
0x0000
,
0x0000
,
0x0000
,
/* 8 */
{
2
,
0x00F9
},
0x0000
,
0x0000
,
0x0000
,
0x0000
,
/* 12 */
{
3
,
0x00F9
},
{
4
,
0x001A
},
{
5
,
0x0004
},
{
6
,
0x0007
},
{
7
,
0x0001
},
{
8
,
0x0020
},
{
9
,
0x0000
},
};
static
const
struct
regmap_config
tlv320aic23_regmap
=
{
.
reg_bits
=
7
,
.
val_bits
=
9
,
.
max_register
=
TLV320AIC23_RESET
,
.
reg_defaults
=
tlv320aic23_reg
,
.
num_reg_defaults
=
ARRAY_SIZE
(
tlv320aic23_reg
),
.
cache_type
=
REGCACHE_RBTREE
,
};
};
static
const
char
*
rec_src_text
[]
=
{
"Line"
,
"Mic"
};
static
const
char
*
rec_src_text
[]
=
{
"Line"
,
"Mic"
};
...
@@ -171,7 +188,7 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
...
@@ -171,7 +188,7 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
/* AIC23 driver data */
/* AIC23 driver data */
struct
aic23
{
struct
aic23
{
enum
snd_soc_control_type
control_type
;
struct
regmap
*
regmap
;
int
mclk
;
int
mclk
;
int
requested_adc
;
int
requested_adc
;
int
requested_dac
;
int
requested_dac
;
...
@@ -532,7 +549,9 @@ static int tlv320aic23_suspend(struct snd_soc_codec *codec)
...
@@ -532,7 +549,9 @@ static int tlv320aic23_suspend(struct snd_soc_codec *codec)
static
int
tlv320aic23_resume
(
struct
snd_soc_codec
*
codec
)
static
int
tlv320aic23_resume
(
struct
snd_soc_codec
*
codec
)
{
{
snd_soc_cache_sync
(
codec
);
struct
aic23
*
aic23
=
snd_soc_codec_get_drvdata
(
codec
);
regcache_mark_dirty
(
aic23
->
regmap
);
regcache_sync
(
aic23
->
regmap
);
tlv320aic23_set_bias_level
(
codec
,
SND_SOC_BIAS_STANDBY
);
tlv320aic23_set_bias_level
(
codec
,
SND_SOC_BIAS_STANDBY
);
return
0
;
return
0
;
...
@@ -540,10 +559,9 @@ static int tlv320aic23_resume(struct snd_soc_codec *codec)
...
@@ -540,10 +559,9 @@ static int tlv320aic23_resume(struct snd_soc_codec *codec)
static
int
tlv320aic23_probe
(
struct
snd_soc_codec
*
codec
)
static
int
tlv320aic23_probe
(
struct
snd_soc_codec
*
codec
)
{
{
struct
aic23
*
aic23
=
snd_soc_codec_get_drvdata
(
codec
);
int
ret
;
int
ret
;
ret
=
snd_soc_codec_set_cache_io
(
codec
,
7
,
9
,
aic23
->
control_type
);
ret
=
snd_soc_codec_set_cache_io
(
codec
,
7
,
9
,
SND_SOC_REGMAP
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
dev_err
(
codec
->
dev
,
"Failed to set cache I/O: %d
\n
"
,
ret
);
dev_err
(
codec
->
dev
,
"Failed to set cache I/O: %d
\n
"
,
ret
);
return
ret
;
return
ret
;
...
@@ -552,16 +570,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
...
@@ -552,16 +570,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
/* Reset codec */
/* Reset codec */
snd_soc_write
(
codec
,
TLV320AIC23_RESET
,
0
);
snd_soc_write
(
codec
,
TLV320AIC23_RESET
,
0
);
/* Write the register default value to cache for reserved registers,
* so the write to the these registers are suppressed by the cache
* restore code when it skips writes of default registers.
*/
snd_soc_cache_write
(
codec
,
0x0A
,
0
);
snd_soc_cache_write
(
codec
,
0x0B
,
0
);
snd_soc_cache_write
(
codec
,
0x0C
,
0
);
snd_soc_cache_write
(
codec
,
0x0D
,
0
);
snd_soc_cache_write
(
codec
,
0x0E
,
0
);
/* power on device */
/* power on device */
tlv320aic23_set_bias_level
(
codec
,
SND_SOC_BIAS_STANDBY
);
tlv320aic23_set_bias_level
(
codec
,
SND_SOC_BIAS_STANDBY
);
...
@@ -586,9 +594,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
...
@@ -586,9 +594,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
snd_soc_write
(
codec
,
TLV320AIC23_ACTIVE
,
0x1
);
snd_soc_write
(
codec
,
TLV320AIC23_ACTIVE
,
0x1
);
snd_soc_add_codec_controls
(
codec
,
tlv320aic23_snd_controls
,
ARRAY_SIZE
(
tlv320aic23_snd_controls
));
return
0
;
return
0
;
}
}
...
@@ -599,21 +604,19 @@ static int tlv320aic23_remove(struct snd_soc_codec *codec)
...
@@ -599,21 +604,19 @@ static int tlv320aic23_remove(struct snd_soc_codec *codec)
}
}
static
struct
snd_soc_codec_driver
soc_codec_dev_tlv320aic23
=
{
static
struct
snd_soc_codec_driver
soc_codec_dev_tlv320aic23
=
{
.
reg_cache_size
=
ARRAY_SIZE
(
tlv320aic23_reg
),
.
reg_word_size
=
sizeof
(
u16
),
.
reg_cache_default
=
tlv320aic23_reg
,
.
probe
=
tlv320aic23_probe
,
.
probe
=
tlv320aic23_probe
,
.
remove
=
tlv320aic23_remove
,
.
remove
=
tlv320aic23_remove
,
.
suspend
=
tlv320aic23_suspend
,
.
suspend
=
tlv320aic23_suspend
,
.
resume
=
tlv320aic23_resume
,
.
resume
=
tlv320aic23_resume
,
.
set_bias_level
=
tlv320aic23_set_bias_level
,
.
set_bias_level
=
tlv320aic23_set_bias_level
,
.
controls
=
tlv320aic23_snd_controls
,
.
num_controls
=
ARRAY_SIZE
(
tlv320aic23_snd_controls
),
.
dapm_widgets
=
tlv320aic23_dapm_widgets
,
.
dapm_widgets
=
tlv320aic23_dapm_widgets
,
.
num_dapm_widgets
=
ARRAY_SIZE
(
tlv320aic23_dapm_widgets
),
.
num_dapm_widgets
=
ARRAY_SIZE
(
tlv320aic23_dapm_widgets
),
.
dapm_routes
=
tlv320aic23_intercon
,
.
dapm_routes
=
tlv320aic23_intercon
,
.
num_dapm_routes
=
ARRAY_SIZE
(
tlv320aic23_intercon
),
.
num_dapm_routes
=
ARRAY_SIZE
(
tlv320aic23_intercon
),
};
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
/*
/*
* If the i2c layer weren't so broken, we could pass this kind of data
* If the i2c layer weren't so broken, we could pass this kind of data
* around
* around
...
@@ -631,8 +634,11 @@ static int tlv320aic23_codec_probe(struct i2c_client *i2c,
...
@@ -631,8 +634,11 @@ static int tlv320aic23_codec_probe(struct i2c_client *i2c,
if
(
aic23
==
NULL
)
if
(
aic23
==
NULL
)
return
-
ENOMEM
;
return
-
ENOMEM
;
aic23
->
regmap
=
devm_regmap_init_i2c
(
i2c
,
&
tlv320aic23_regmap
);
if
(
IS_ERR
(
aic23
->
regmap
))
return
PTR_ERR
(
aic23
->
regmap
);
i2c_set_clientdata
(
i2c
,
aic23
);
i2c_set_clientdata
(
i2c
,
aic23
);
aic23
->
control_type
=
SND_SOC_I2C
;
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
&
soc_codec_dev_tlv320aic23
,
&
tlv320aic23_dai
,
1
);
&
soc_codec_dev_tlv320aic23
,
&
tlv320aic23_dai
,
1
);
...
@@ -660,29 +666,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
...
@@ -660,29 +666,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
.
id_table
=
tlv320aic23_id
,
.
id_table
=
tlv320aic23_id
,
};
};
#endif
module_i2c_driver
(
tlv320aic23_i2c_driver
);
static
int
__init
tlv320aic23_modinit
(
void
)
{
int
ret
;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret
=
i2c_add_driver
(
&
tlv320aic23_i2c_driver
);
if
(
ret
!=
0
)
{
printk
(
KERN_ERR
"Failed to register TLV320AIC23 I2C driver: %d
\n
"
,
ret
);
}
#endif
return
ret
;
}
module_init
(
tlv320aic23_modinit
);
static
void
__exit
tlv320aic23_exit
(
void
)
{
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver
(
&
tlv320aic23_i2c_driver
);
#endif
}
module_exit
(
tlv320aic23_exit
);
MODULE_DESCRIPTION
(
"ASoC TLV320AIC23 codec driver"
);
MODULE_DESCRIPTION
(
"ASoC TLV320AIC23 codec driver"
);
MODULE_AUTHOR
(
"Arun KS <arunks@mistralsolutions.com>"
);
MODULE_AUTHOR
(
"Arun KS <arunks@mistralsolutions.com>"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录