Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
fb66ebd8
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
fb66ebd8
编写于
10月 13, 2009
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/hda' into for-linus
上级
29a4f2d3
491dc043
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
55 addition
and
8 deletion
+55
-8
Documentation/sound/alsa/HD-Audio-Models.txt
Documentation/sound/alsa/HD-Audio-Models.txt
+1
-0
sound/pci/hda/patch_nvhdmi.c
sound/pci/hda/patch_nvhdmi.c
+25
-6
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+1
-1
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_sigmatel.c
+28
-1
未找到文件。
Documentation/sound/alsa/HD-Audio-Models.txt
浏览文件 @
fb66ebd8
...
...
@@ -359,6 +359,7 @@ STAC9227/9228/9229/927x
5stack-no-fp D965 5stack without front panel
dell-3stack Dell Dimension E520
dell-bios Fixes with Dell BIOS setup
volknob Fixes with volume-knob widget 0x24
auto BIOS setup (default)
STAC92HD71B*
...
...
sound/pci/hda/patch_nvhdmi.c
浏览文件 @
fb66ebd8
...
...
@@ -29,6 +29,9 @@
#include "hda_codec.h"
#include "hda_local.h"
/* define below to restrict the supported rates and formats */
/* #define LIMITED_RATE_FMT_SUPPORT */
struct
nvhdmi_spec
{
struct
hda_multi_out
multiout
;
...
...
@@ -60,6 +63,22 @@ static struct hda_verb nvhdmi_basic_init[] = {
{}
/* terminator */
};
#ifdef LIMITED_RATE_FMT_SUPPORT
/* support only the safe format and rate */
#define SUPPORTED_RATES SNDRV_PCM_RATE_48000
#define SUPPORTED_MAXBPS 16
#define SUPPORTED_FORMATS SNDRV_PCM_FMTBIT_S16_LE
#else
/* support all rates and formats */
#define SUPPORTED_RATES \
(SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\
SNDRV_PCM_RATE_192000)
#define SUPPORTED_MAXBPS 24
#define SUPPORTED_FORMATS \
(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
#endif
/*
* Controls
*/
...
...
@@ -258,9 +277,9 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = {
.
channels_min
=
2
,
.
channels_max
=
8
,
.
nid
=
Nv_Master_Convert_nid
,
.
rates
=
S
NDRV_PCM_RATE_48000
,
.
maxbps
=
16
,
.
formats
=
S
NDRV_PCM_FMTBIT_S16_LE
,
.
rates
=
S
UPPORTED_RATES
,
.
maxbps
=
SUPPORTED_MAXBPS
,
.
formats
=
S
UPPORTED_FORMATS
,
.
ops
=
{
.
open
=
nvhdmi_dig_playback_pcm_open
,
.
close
=
nvhdmi_dig_playback_pcm_close_8ch
,
...
...
@@ -273,9 +292,9 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = {
.
channels_min
=
2
,
.
channels_max
=
2
,
.
nid
=
Nv_Master_Convert_nid
,
.
rates
=
S
NDRV_PCM_RATE_48000
,
.
maxbps
=
16
,
.
formats
=
S
NDRV_PCM_FMTBIT_S16_LE
,
.
rates
=
S
UPPORTED_RATES
,
.
maxbps
=
SUPPORTED_MAXBPS
,
.
formats
=
S
UPPORTED_FORMATS
,
.
ops
=
{
.
open
=
nvhdmi_dig_playback_pcm_open
,
.
close
=
nvhdmi_dig_playback_pcm_close_2ch
,
...
...
sound/pci/hda/patch_realtek.c
浏览文件 @
fb66ebd8
...
...
@@ -275,7 +275,7 @@ struct alc_spec {
struct snd_kcontrol_new *cap_mixer; /* capture mixer */
unsigned int beep_amp; /* beep amp value, set via set_beep_amp() */
const struct hda_verb *init_verbs[
5
]; /* initialization verbs
const struct hda_verb *init_verbs[
10
]; /* initialization verbs
* don't forget NULL
* termination!
*/
...
...
sound/pci/hda/patch_sigmatel.c
浏览文件 @
fb66ebd8
...
...
@@ -158,6 +158,7 @@ enum {
STAC_D965_5ST_NO_FP
,
STAC_DELL_3ST
,
STAC_DELL_BIOS
,
STAC_927X_VOLKNOB
,
STAC_927X_MODELS
};
...
...
@@ -907,6 +908,16 @@ static struct hda_verb d965_core_init[] = {
{}
};
static
struct
hda_verb
dell_3st_core_init
[]
=
{
/* don't set delta bit */
{
0x24
,
AC_VERB_SET_VOLUME_KNOB_CONTROL
,
0x7f
},
/* unmute node 0x1b */
{
0x1b
,
AC_VERB_SET_AMP_GAIN_MUTE
,
0xb000
},
/* select node 0x03 as DAC */
{
0x0b
,
AC_VERB_SET_CONNECT_SEL
,
0x01
},
{}
};
static
struct
hda_verb
stac927x_core_init
[]
=
{
/* set master volume and direct control */
{
0x24
,
AC_VERB_SET_VOLUME_KNOB_CONTROL
,
0xff
},
...
...
@@ -915,6 +926,14 @@ static struct hda_verb stac927x_core_init[] = {
{}
};
static
struct
hda_verb
stac927x_volknob_core_init
[]
=
{
/* don't set delta bit */
{
0x24
,
AC_VERB_SET_VOLUME_KNOB_CONTROL
,
0x7f
},
/* enable analog pc beep path */
{
0x01
,
AC_VERB_SET_DIGI_CONVERT_2
,
1
<<
5
},
{}
};
static
struct
hda_verb
stac9205_core_init
[]
=
{
/* set master volume and direct control */
{
0x24
,
AC_VERB_SET_VOLUME_KNOB_CONTROL
,
0xff
},
...
...
@@ -1999,6 +2018,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
[
STAC_D965_5ST_NO_FP
]
=
d965_5st_no_fp_pin_configs
,
[
STAC_DELL_3ST
]
=
dell_3st_pin_configs
,
[
STAC_DELL_BIOS
]
=
NULL
,
[
STAC_927X_VOLKNOB
]
=
NULL
,
};
static
const
char
*
stac927x_models
[
STAC_927X_MODELS
]
=
{
...
...
@@ -2010,6 +2030,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = {
[
STAC_D965_5ST_NO_FP
]
=
"5stack-no-fp"
,
[
STAC_DELL_3ST
]
=
"dell-3stack"
,
[
STAC_DELL_BIOS
]
=
"dell-bios"
,
[
STAC_927X_VOLKNOB
]
=
"volknob"
,
};
static
struct
snd_pci_quirk
stac927x_cfg_tbl
[]
=
{
...
...
@@ -2045,6 +2066,8 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
"Intel D965"
,
STAC_D965_5ST
),
SND_PCI_QUIRK_MASK
(
PCI_VENDOR_ID_INTEL
,
0xff00
,
0x2500
,
"Intel D965"
,
STAC_D965_5ST
),
/* volume-knob fixes */
SND_PCI_QUIRK_VENDOR
(
0x10cf
,
"FSC"
,
STAC_927X_VOLKNOB
),
{}
/* terminator */
};
...
...
@@ -5612,10 +5635,14 @@ static int patch_stac927x(struct hda_codec *codec)
spec
->
dmic_nids
=
stac927x_dmic_nids
;
spec
->
num_dmics
=
STAC927X_NUM_DMICS
;
spec
->
init
=
d
965
_core_init
;
spec
->
init
=
d
ell_3st
_core_init
;
spec
->
dmux_nids
=
stac927x_dmux_nids
;
spec
->
num_dmuxes
=
ARRAY_SIZE
(
stac927x_dmux_nids
);
break
;
case
STAC_927X_VOLKNOB
:
spec
->
num_dmics
=
0
;
spec
->
init
=
stac927x_volknob_core_init
;
break
;
default:
spec
->
num_dmics
=
0
;
spec
->
init
=
stac927x_core_init
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录