Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
9b1a88c7
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b1a88c7
编写于
4月 13, 2009
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-2.6.30' into for-2.6.31
上级
f2644a2c
6e498d5e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
15 deletion
+15
-15
sound/soc/codecs/twl4030.c
sound/soc/codecs/twl4030.c
+6
-4
sound/soc/fsl/fsl_dma.c
sound/soc/fsl/fsl_dma.c
+6
-6
sound/soc/pxa/magician.c
sound/soc/pxa/magician.c
+0
-2
sound/soc/s3c24xx/Kconfig
sound/soc/s3c24xx/Kconfig
+3
-3
未找到文件。
sound/soc/codecs/twl4030.c
浏览文件 @
9b1a88c7
...
...
@@ -1220,11 +1220,12 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
return
0
;
}
static
int
twl4030_startup
(
struct
snd_pcm_substream
*
substream
)
static
int
twl4030_startup
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_device
*
socdev
=
rtd
->
socdev
;
struct
snd_soc_codec
*
codec
=
socdev
->
codec
;
struct
snd_soc_codec
*
codec
=
socdev
->
c
ard
->
c
odec
;
struct
twl4030_priv
*
twl4030
=
codec
->
private_data
;
/* If we already have a playback or capture going then constrain
...
...
@@ -1251,11 +1252,12 @@ static int twl4030_startup(struct snd_pcm_substream *substream)
return
0
;
}
static
void
twl4030_shutdown
(
struct
snd_pcm_substream
*
substream
)
static
void
twl4030_shutdown
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_device
*
socdev
=
rtd
->
socdev
;
struct
snd_soc_codec
*
codec
=
socdev
->
codec
;
struct
snd_soc_codec
*
codec
=
socdev
->
c
ard
->
c
odec
;
struct
twl4030_priv
*
twl4030
=
codec
->
private_data
;
if
(
twl4030
->
master_substream
==
substream
)
...
...
sound/soc/fsl/fsl_dma.c
浏览文件 @
9b1a88c7
...
...
@@ -300,7 +300,7 @@ static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
if
(
!
card
->
dev
->
coherent_dma_mask
)
card
->
dev
->
coherent_dma_mask
=
fsl_dma_dmamask
;
ret
=
snd_dma_alloc_pages
(
SNDRV_DMA_TYPE_DEV
,
pcm
->
dev
,
ret
=
snd_dma_alloc_pages
(
SNDRV_DMA_TYPE_DEV
,
card
->
dev
,
fsl_dma_hardware
.
buffer_bytes_max
,
&
pcm
->
streams
[
0
].
substream
->
dma_buffer
);
if
(
ret
)
{
...
...
@@ -310,7 +310,7 @@ static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
return
-
ENOMEM
;
}
ret
=
snd_dma_alloc_pages
(
SNDRV_DMA_TYPE_DEV
,
pcm
->
dev
,
ret
=
snd_dma_alloc_pages
(
SNDRV_DMA_TYPE_DEV
,
card
->
dev
,
fsl_dma_hardware
.
buffer_bytes_max
,
&
pcm
->
streams
[
1
].
substream
->
dma_buffer
);
if
(
ret
)
{
...
...
@@ -418,7 +418,7 @@ static int fsl_dma_open(struct snd_pcm_substream *substream)
return
-
EBUSY
;
}
dma_private
=
dma_alloc_coherent
(
substream
->
pcm
->
dev
,
dma_private
=
dma_alloc_coherent
(
substream
->
pcm
->
card
->
dev
,
sizeof
(
struct
fsl_dma_private
),
&
ld_buf_phys
,
GFP_KERNEL
);
if
(
!
dma_private
)
{
dev_err
(
substream
->
pcm
->
card
->
dev
,
...
...
@@ -445,7 +445,7 @@ static int fsl_dma_open(struct snd_pcm_substream *substream)
dev_err
(
substream
->
pcm
->
card
->
dev
,
"can't register ISR for IRQ %u (ret=%i)
\n
"
,
dma_private
->
irq
,
ret
);
dma_free_coherent
(
substream
->
pcm
->
dev
,
dma_free_coherent
(
substream
->
pcm
->
card
->
dev
,
sizeof
(
struct
fsl_dma_private
),
dma_private
,
dma_private
->
ld_buf_phys
);
return
ret
;
...
...
@@ -778,13 +778,13 @@ static int fsl_dma_close(struct snd_pcm_substream *substream)
free_irq
(
dma_private
->
irq
,
dma_private
);
if
(
dma_private
->
ld_buf_phys
)
{
dma_unmap_single
(
substream
->
pcm
->
dev
,
dma_unmap_single
(
substream
->
pcm
->
card
->
dev
,
dma_private
->
ld_buf_phys
,
sizeof
(
dma_private
->
link
),
DMA_TO_DEVICE
);
}
/* Deallocate the fsl_dma_private structure */
dma_free_coherent
(
substream
->
pcm
->
dev
,
dma_free_coherent
(
substream
->
pcm
->
card
->
dev
,
sizeof
(
struct
fsl_dma_private
),
dma_private
,
dma_private
->
ld_buf_phys
);
substream
->
runtime
->
private_data
=
NULL
;
...
...
sound/soc/pxa/magician.c
浏览文件 @
9b1a88c7
...
...
@@ -27,8 +27,6 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <mach/pxa-regs.h>
#include <mach/hardware.h>
#include <mach/magician.h>
#include <asm/mach-types.h>
#include "../codecs/uda1380.h"
...
...
sound/soc/s3c24xx/Kconfig
浏览文件 @
9b1a88c7
config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3CXXXX chips"
depends on ARCH_S3C2410
|| ARCH_S3C64XX
depends on ARCH_S3C2410
help
Say Y or M if you want to add support for codecs attached to
the S3C24XX
and S3C64XX AC97, I2S or SSP interface. You will
also need to
select the audio interfaces to support below.
the S3C24XX
AC97 or I2S interfaces. You will also need to
select the audio interfaces to support below.
config SND_S3C24XX_SOC_I2S
tristate
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录