Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
c6d46678
cloud-kernel
项目概览
openanolis
/
cloud-kernel
12 个月 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6d46678
编写于
4月 18, 2011
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'tegra' into for-2.6.40
上级
d5381e42
61a6d076
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
12 deletion
+14
-12
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-harmony.c
+4
-3
arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
+3
-2
sound/soc/tegra/harmony.c
sound/soc/tegra/harmony.c
+7
-7
未找到文件。
arch/arm/mach-tegra/board-harmony.c
浏览文件 @
c6d46678
...
...
@@ -34,7 +34,7 @@
#include <asm/mach/time.h>
#include <asm/setup.h>
#include <mach/
harmony_audio
.h>
#include <mach/
tegra_wm8903_pdata
.h>
#include <mach/iomap.h>
#include <mach/irqs.h>
#include <mach/sdhci.h>
...
...
@@ -67,15 +67,16 @@ static struct platform_device debug_uart = {
},
};
static
struct
harmony_audio
_platform_data
harmony_audio_pdata
=
{
static
struct
tegra_wm8903
_platform_data
harmony_audio_pdata
=
{
.
gpio_spkr_en
=
TEGRA_GPIO_SPKR_EN
,
.
gpio_hp_det
=
TEGRA_GPIO_HP_DET
,
.
gpio_hp_mute
=
-
1
,
.
gpio_int_mic_en
=
TEGRA_GPIO_INT_MIC_EN
,
.
gpio_ext_mic_en
=
TEGRA_GPIO_EXT_MIC_EN
,
};
static
struct
platform_device
harmony_audio_device
=
{
.
name
=
"tegra-snd-
harmony
"
,
.
name
=
"tegra-snd-
wm8903
"
,
.
id
=
0
,
.
dev
=
{
.
platform_data
=
&
harmony_audio_pdata
,
...
...
arch/arm/mach-tegra/include/mach/
harmony_audio
.h
→
arch/arm/mach-tegra/include/mach/
tegra_wm8903_pdata
.h
浏览文件 @
c6d46678
/*
* arch/arm/mach-tegra/include/mach/
harmony_audio
.h
* arch/arm/mach-tegra/include/mach/
tegra_wm8903_pdata
.h
*
* Copyright 2011 NVIDIA, Inc.
*
...
...
@@ -14,9 +14,10 @@
*
*/
struct
harmony_audio
_platform_data
{
struct
tegra_wm8903
_platform_data
{
int
gpio_spkr_en
;
int
gpio_hp_det
;
int
gpio_hp_mute
;
int
gpio_int_mic_en
;
int
gpio_ext_mic_en
;
};
sound/soc/tegra/harmony.c
浏览文件 @
c6d46678
...
...
@@ -35,7 +35,7 @@
#include <linux/slab.h>
#include <linux/gpio.h>
#include <mach/
harmony_audio
.h>
#include <mach/
tegra_wm8903_pdata
.h>
#include <sound/core.h>
#include <sound/jack.h>
...
...
@@ -50,7 +50,7 @@
#include "tegra_pcm.h"
#include "tegra_asoc_utils.h"
#define DRV_NAME "tegra-snd-
harmony
"
#define DRV_NAME "tegra-snd-
wm8903
"
#define GPIO_SPKR_EN BIT(0)
#define GPIO_INT_MIC_EN BIT(1)
...
...
@@ -58,7 +58,7 @@
struct
tegra_harmony
{
struct
tegra_asoc_utils_data
util_data
;
struct
harmony_audio
_platform_data
*
pdata
;
struct
tegra_wm8903
_platform_data
*
pdata
;
int
gpio_requested
;
};
...
...
@@ -163,7 +163,7 @@ static int harmony_event_int_spk(struct snd_soc_dapm_widget *w,
struct
snd_soc_codec
*
codec
=
w
->
codec
;
struct
snd_soc_card
*
card
=
codec
->
card
;
struct
tegra_harmony
*
harmony
=
snd_soc_card_get_drvdata
(
card
);
struct
harmony_audio
_platform_data
*
pdata
=
harmony
->
pdata
;
struct
tegra_wm8903
_platform_data
*
pdata
=
harmony
->
pdata
;
gpio_set_value_cansleep
(
pdata
->
gpio_spkr_en
,
SND_SOC_DAPM_EVENT_ON
(
event
));
...
...
@@ -198,7 +198,7 @@ static int harmony_asoc_init(struct snd_soc_pcm_runtime *rtd)
struct
snd_soc_dapm_context
*
dapm
=
&
codec
->
dapm
;
struct
snd_soc_card
*
card
=
codec
->
card
;
struct
tegra_harmony
*
harmony
=
snd_soc_card_get_drvdata
(
card
);
struct
harmony_audio
_platform_data
*
pdata
=
harmony
->
pdata
;
struct
tegra_wm8903
_platform_data
*
pdata
=
harmony
->
pdata
;
int
ret
;
ret
=
gpio_request
(
pdata
->
gpio_spkr_en
,
"spkr_en"
);
...
...
@@ -291,7 +291,7 @@ static __devinit int tegra_snd_harmony_probe(struct platform_device *pdev)
{
struct
snd_soc_card
*
card
=
&
snd_soc_harmony
;
struct
tegra_harmony
*
harmony
;
struct
harmony_audio
_platform_data
*
pdata
;
struct
tegra_wm8903
_platform_data
*
pdata
;
int
ret
;
if
(
!
machine_is_harmony
())
{
...
...
@@ -344,7 +344,7 @@ static int __devexit tegra_snd_harmony_remove(struct platform_device *pdev)
{
struct
snd_soc_card
*
card
=
platform_get_drvdata
(
pdev
);
struct
tegra_harmony
*
harmony
=
snd_soc_card_get_drvdata
(
card
);
struct
harmony_audio
_platform_data
*
pdata
=
harmony
->
pdata
;
struct
tegra_wm8903
_platform_data
*
pdata
=
harmony
->
pdata
;
snd_soc_unregister_card
(
card
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录