Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
0640f84f
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
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看板
提交
0640f84f
编写于
12月 03, 2008
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/hda-modularize' into topic/hda
上级
8c2f767b
ff7a3267
变更
18
展开全部
显示空白变更内容
内联
并排
Showing
18 changed file
with
543 addition
and
109 deletion
+543
-109
sound/pci/hda/Kconfig
sound/pci/hda/Kconfig
+50
-0
sound/pci/hda/Makefile
sound/pci/hda/Makefile
+57
-20
sound/pci/hda/hda_beep.c
sound/pci/hda/hda_beep.c
+2
-0
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.c
+143
-44
sound/pci/hda/hda_codec.h
sound/pci/hda/hda_codec.h
+26
-0
sound/pci/hda/hda_generic.c
sound/pci/hda/hda_generic.c
+1
-0
sound/pci/hda/hda_hwdep.c
sound/pci/hda/hda_hwdep.c
+1
-1
sound/pci/hda/hda_patch.h
sound/pci/hda/hda_patch.h
+0
-24
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_analog.c
+24
-2
sound/pci/hda/patch_atihdmi.c
sound/pci/hda/patch_atihdmi.c
+29
-2
sound/pci/hda/patch_cmedia.c
sound/pci/hda/patch_cmedia.c
+25
-2
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_conexant.c
+26
-2
sound/pci/hda/patch_intelhdmi.c
sound/pci/hda/patch_intelhdmi.c
+28
-2
sound/pci/hda/patch_nvhdmi.c
sound/pci/hda/patch_nvhdmi.c
+25
-2
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+24
-2
sound/pci/hda/patch_si3054.c
sound/pci/hda/patch_si3054.c
+33
-2
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_sigmatel.c
+25
-2
sound/pci/hda/patch_via.c
sound/pci/hda/patch_via.c
+24
-2
未找到文件。
sound/pci/hda/Kconfig
浏览文件 @
0640f84f
...
...
@@ -46,6 +46,11 @@ config SND_HDA_CODEC_REALTEK
Say Y here to include Realtek HD-audio codec support in
snd-hda-intel driver, such as ALC880.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-realtek.
This module is automatically loaded at probing.
config SND_HDA_CODEC_ANALOG
bool "Build Analog Device HD-audio codec support"
default y
...
...
@@ -53,6 +58,11 @@ config SND_HDA_CODEC_ANALOG
Say Y here to include Analog Device HD-audio codec support in
snd-hda-intel driver, such as AD1986A.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-analog.
This module is automatically loaded at probing.
config SND_HDA_CODEC_SIGMATEL
bool "Build IDT/Sigmatel HD-audio codec support"
default y
...
...
@@ -60,6 +70,11 @@ config SND_HDA_CODEC_SIGMATEL
Say Y here to include IDT (Sigmatel) HD-audio codec support in
snd-hda-intel driver, such as STAC9200.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-idt.
This module is automatically loaded at probing.
config SND_HDA_CODEC_VIA
bool "Build VIA HD-audio codec support"
default y
...
...
@@ -67,6 +82,11 @@ config SND_HDA_CODEC_VIA
Say Y here to include VIA HD-audio codec support in
snd-hda-intel driver, such as VT1708.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-via.
This module is automatically loaded at probing.
config SND_HDA_CODEC_ATIHDMI
bool "Build ATI HDMI HD-audio codec support"
default y
...
...
@@ -74,6 +94,11 @@ config SND_HDA_CODEC_ATIHDMI
Say Y here to include ATI HDMI HD-audio codec support in
snd-hda-intel driver, such as ATI RS600 HDMI.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-atihdmi.
This module is automatically loaded at probing.
config SND_HDA_CODEC_NVHDMI
bool "Build NVIDIA HDMI HD-audio codec support"
default y
...
...
@@ -81,6 +106,11 @@ config SND_HDA_CODEC_NVHDMI
Say Y here to include NVIDIA HDMI HD-audio codec support in
snd-hda-intel driver, such as NVIDIA MCP78 HDMI.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-nvhdmi.
This module is automatically loaded at probing.
config SND_HDA_CODEC_INTELHDMI
bool "Build INTEL HDMI HD-audio codec support"
default y
...
...
@@ -88,6 +118,11 @@ config SND_HDA_CODEC_INTELHDMI
Say Y here to include INTEL HDMI HD-audio codec support in
snd-hda-intel driver, such as Eaglelake integrated HDMI.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-intelhdmi.
This module is automatically loaded at probing.
config SND_HDA_ELD
def_bool y
depends on SND_HDA_CODEC_INTELHDMI
...
...
@@ -99,6 +134,11 @@ config SND_HDA_CODEC_CONEXANT
Say Y here to include Conexant HD-audio codec support in
snd-hda-intel driver, such as CX20549.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-conexant.
This module is automatically loaded at probing.
config SND_HDA_CODEC_CMEDIA
bool "Build C-Media HD-audio codec support"
default y
...
...
@@ -106,6 +146,11 @@ config SND_HDA_CODEC_CMEDIA
Say Y here to include C-Media HD-audio codec support in
snd-hda-intel driver, such as CMI9880.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-cmedia.
This module is automatically loaded at probing.
config SND_HDA_CODEC_SI3054
bool "Build Silicon Labs 3054 HD-modem codec support"
default y
...
...
@@ -113,6 +158,11 @@ config SND_HDA_CODEC_SI3054
Say Y here to include Silicon Labs 3054 HD-modem codec
(and compatibles) support in snd-hda-intel driver.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-si3054.
This module is automatically loaded at probing.
config SND_HDA_GENERIC
bool "Enable generic HD-audio codec parser"
default y
...
...
sound/pci/hda/Makefile
浏览文件 @
0640f84f
snd-hda-intel-y
:=
hda_intel.o
# since snd-hda-intel is the only driver using hda-codec,
# merge it into a single module although it was originally
# designed to be individual modules
snd-hda-intel-y
+=
hda_codec.o
snd-hda-intel-$(CONFIG_PROC_FS)
+=
hda_proc.o
snd-hda-intel-$(CONFIG_SND_HDA_ELD)
+=
hda_eld.o
snd-hda-intel-$(CONFIG_SND_HDA_HWDEP)
+=
hda_hwdep.o
snd-hda-intel-$(CONFIG_SND_HDA_INPUT_BEEP)
+=
hda_beep.o
snd-hda-intel-$(CONFIG_SND_HDA_GENERIC)
+=
hda_generic.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_REALTEK)
+=
patch_realtek.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CMEDIA)
+=
patch_cmedia.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ANALOG)
+=
patch_analog.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SIGMATEL)
+=
patch_sigmatel.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SI3054)
+=
patch_si3054.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ATIHDMI)
+=
patch_atihdmi.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CONEXANT)
+=
patch_conexant.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_VIA)
+=
patch_via.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_NVHDMI)
+=
patch_nvhdmi.o
snd-hda-intel-$(CONFIG_SND_HDA_CODEC_INTELHDMI)
+=
patch_intelhdmi.o
snd-hda-intel-objs
:=
hda_intel.o
snd-hda-codec-y
:=
hda_codec.o
snd-hda-codec-$(CONFIG_SND_HDA_GENERIC)
+=
hda_generic.o
snd-hda-codec-$(CONFIG_PROC_FS)
+=
hda_proc.o
# snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP)
+=
hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP)
+=
hda_beep.o
snd-hda-codec-realtek-objs
:=
patch_realtek.o
snd-hda-codec-cmedia-objs
:=
patch_cmedia.o
snd-hda-codec-analog-objs
:=
patch_analog.o
snd-hda-codec-idt-objs
:=
patch_sigmatel.o
snd-hda-codec-si3054-objs
:=
patch_si3054.o
snd-hda-codec-atihdmi-objs
:=
patch_atihdmi.o
snd-hda-codec-conexant-objs
:=
patch_conexant.o
snd-hda-codec-via-objs
:=
patch_via.o
snd-hda-codec-nvhdmi-objs
:=
patch_nvhdmi.o
snd-hda-codec-intelhdmi-objs
:=
patch_intelhdmi.o hda_eld.o
# common driver
obj-$(CONFIG_SND_HDA_INTEL)
:=
snd-hda-codec.o
# codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans)
ifdef
CONFIG_SND_HDA_CODEC_REALTEK
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-realtek.o
endif
ifdef
CONFIG_SND_HDA_CODEC_CMEDIA
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-cmedia.o
endif
ifdef
CONFIG_SND_HDA_CODEC_ANALOG
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-analog.o
endif
ifdef
CONFIG_SND_HDA_CODEC_SIGMATEL
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-idt.o
endif
ifdef
CONFIG_SND_HDA_CODEC_SI3054
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-si3054.o
endif
ifdef
CONFIG_SND_HDA_CODEC_ATIHDMI
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-atihdmi.o
endif
ifdef
CONFIG_SND_HDA_CODEC_CONEXANT
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-conexant.o
endif
ifdef
CONFIG_SND_HDA_CODEC_VIA
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-via.o
endif
ifdef
CONFIG_SND_HDA_CODEC_NVHDMI
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-nvhdmi.o
endif
ifdef
CONFIG_SND_HDA_CODEC_INTELHDMI
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-intelhdmi.o
endif
# this must be the last entry after codec drivers;
# otherwise the codec patches won't be hooked before the PCI probe
# when built in kernel
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-intel.o
sound/pci/hda/hda_beep.c
浏览文件 @
0640f84f
...
...
@@ -128,6 +128,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
INIT_WORK
(
&
beep
->
beep_work
,
&
snd_hda_generate_beep
);
return
0
;
}
EXPORT_SYMBOL_HDA
(
snd_hda_attach_beep_device
);
void
snd_hda_detach_beep_device
(
struct
hda_codec
*
codec
)
{
...
...
@@ -140,3 +141,4 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
kfree
(
beep
);
}
}
EXPORT_SYMBOL_HDA
(
snd_hda_detach_beep_device
);
sound/pci/hda/hda_codec.c
浏览文件 @
0640f84f
此差异已折叠。
点击以展开。
sound/pci/hda/hda_codec.h
浏览文件 @
0640f84f
...
...
@@ -640,6 +640,16 @@ struct hda_codec_preset {
int
(
*
patch
)(
struct
hda_codec
*
codec
);
};
struct
hda_codec_preset_list
{
const
struct
hda_codec_preset
*
preset
;
struct
module
*
owner
;
struct
list_head
list
;
};
/* initial hook */
int
snd_hda_add_codec_preset
(
struct
hda_codec_preset_list
*
preset
);
int
snd_hda_delete_codec_preset
(
struct
hda_codec_preset_list
*
preset
);
/* ops set by the preset patch */
struct
hda_codec_ops
{
int
(
*
build_controls
)(
struct
hda_codec
*
codec
);
...
...
@@ -733,6 +743,7 @@ struct hda_codec {
/* detected preset */
const
struct
hda_codec_preset
*
preset
;
struct
module
*
owner
;
const
char
*
name
;
/* codec name */
const
char
*
modelname
;
/* model name for preset */
...
...
@@ -896,4 +907,19 @@ static inline void snd_hda_power_down(struct hda_codec *codec) {}
#define snd_hda_codec_needs_resume(codec) 1
#endif
/*
* Codec modularization
*/
/* Export symbols only for communication with codec drivers;
* When built in kernel, all HD-audio drivers are supposed to be statically
* linked to the kernel. Thus, the symbols don't have to (or shouldn't) be
* exported unless it's built as a module.
*/
#ifdef MODULE
#define EXPORT_SYMBOL_HDA(sym) EXPORT_SYMBOL_GPL(sym)
#else
#define EXPORT_SYMBOL_HDA(sym)
#endif
#endif
/* __SOUND_HDA_CODEC_H */
sound/pci/hda/hda_generic.c
浏览文件 @
0640f84f
...
...
@@ -1101,3 +1101,4 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec)
snd_hda_generic_free
(
codec
);
return
err
;
}
EXPORT_SYMBOL
(
snd_hda_parse_generic_codec
);
sound/pci/hda/hda_hwdep.c
浏览文件 @
0640f84f
...
...
@@ -116,7 +116,7 @@ static void hwdep_free(struct snd_hwdep *hwdep)
clear_hwdep_elements
(
hwdep
->
private_data
);
}
int
__devinit
snd_hda_create_hwdep
(
struct
hda_codec
*
codec
)
int
/*__devinit*/
snd_hda_create_hwdep
(
struct
hda_codec
*
codec
)
{
char
hwname
[
16
];
struct
snd_hwdep
*
hwdep
;
...
...
sound/pci/hda/hda_patch.h
已删除
100644 → 0
浏览文件 @
8c2f767b
/*
* HDA Patches - included by hda_codec.c
*/
/* Realtek codecs */
extern
struct
hda_codec_preset
snd_hda_preset_realtek
[];
/* C-Media codecs */
extern
struct
hda_codec_preset
snd_hda_preset_cmedia
[];
/* Analog Devices codecs */
extern
struct
hda_codec_preset
snd_hda_preset_analog
[];
/* SigmaTel codecs */
extern
struct
hda_codec_preset
snd_hda_preset_sigmatel
[];
/* SiLabs 3054/3055 modem codecs */
extern
struct
hda_codec_preset
snd_hda_preset_si3054
[];
/* ATI HDMI codecs */
extern
struct
hda_codec_preset
snd_hda_preset_atihdmi
[];
/* Conexant audio codec */
extern
struct
hda_codec_preset
snd_hda_preset_conexant
[];
/* VIA codecs */
extern
struct
hda_codec_preset
snd_hda_preset_via
[];
/* NVIDIA HDMI codecs */
extern
struct
hda_codec_preset
snd_hda_preset_nvhdmi
[];
/* INTEL HDMI codecs */
extern
struct
hda_codec_preset
snd_hda_preset_intelhdmi
[];
sound/pci/hda/patch_analog.c
浏览文件 @
0640f84f
...
...
@@ -27,7 +27,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
struct
ad198x_spec
{
struct
snd_kcontrol_new
*
mixers
[
5
];
...
...
@@ -4308,7 +4307,7 @@ static int patch_ad1882(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_analog
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_analog
[]
=
{
{
.
id
=
0x11d4184a
,
.
name
=
"AD1884A"
,
.
patch
=
patch_ad1884a
},
{
.
id
=
0x11d41882
,
.
name
=
"AD1882"
,
.
patch
=
patch_ad1882
},
{
.
id
=
0x11d41883
,
.
name
=
"AD1883"
,
.
patch
=
patch_ad1884a
},
...
...
@@ -4326,3 +4325,26 @@ struct hda_codec_preset snd_hda_preset_analog[] = {
{
.
id
=
0x11d4989b
,
.
name
=
"AD1989B"
,
.
patch
=
patch_ad1988
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:11d4*"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Analog Devices HD-audio codec"
);
static
struct
hda_codec_preset_list
analog_list
=
{
.
preset
=
snd_hda_preset_analog
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_analog_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
analog_list
);
}
static
void
__exit
patch_analog_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
analog_list
);
}
module_init
(
patch_analog_init
)
module_exit
(
patch_analog_exit
)
sound/pci/hda/patch_atihdmi.c
浏览文件 @
0640f84f
...
...
@@ -27,7 +27,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
struct
atihdmi_spec
{
struct
hda_multi_out
multiout
;
...
...
@@ -187,7 +186,7 @@ static int patch_atihdmi(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_atihdmi
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_atihdmi
[]
=
{
{
.
id
=
0x1002793c
,
.
name
=
"ATI RS600 HDMI"
,
.
patch
=
patch_atihdmi
},
{
.
id
=
0x10027919
,
.
name
=
"ATI RS600 HDMI"
,
.
patch
=
patch_atihdmi
},
{
.
id
=
0x1002791a
,
.
name
=
"ATI RS690/780 HDMI"
,
.
patch
=
patch_atihdmi
},
...
...
@@ -196,3 +195,31 @@ struct hda_codec_preset snd_hda_preset_atihdmi[] = {
{
.
id
=
0x17e80047
,
.
name
=
"Chrontel HDMI"
,
.
patch
=
patch_atihdmi
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:1002793c"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10027919"
);
MODULE_ALIAS
(
"snd-hda-codec-id:1002791a"
);
MODULE_ALIAS
(
"snd-hda-codec-id:1002aa01"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10951390"
);
MODULE_ALIAS
(
"snd-hda-codec-id:17e80047"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"ATI HDMI HD-audio codec"
);
static
struct
hda_codec_preset_list
atihdmi_list
=
{
.
preset
=
snd_hda_preset_atihdmi
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_atihdmi_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
atihdmi_list
);
}
static
void
__exit
patch_atihdmi_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
atihdmi_list
);
}
module_init
(
patch_atihdmi_init
)
module_exit
(
patch_atihdmi_exit
)
sound/pci/hda/patch_cmedia.c
浏览文件 @
0640f84f
...
...
@@ -28,7 +28,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
#define NUM_PINS 11
...
...
@@ -736,8 +735,32 @@ static int patch_cmi9880(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_cmedia
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_cmedia
[]
=
{
{
.
id
=
0x13f69880
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{
.
id
=
0x434d4980
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:13f69880"
);
MODULE_ALIAS
(
"snd-hda-codec-id:434d4980"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"C-Media HD-audio codec"
);
static
struct
hda_codec_preset_list
cmedia_list
=
{
.
preset
=
snd_hda_preset_cmedia
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_cmedia_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
cmedia_list
);
}
static
void
__exit
patch_cmedia_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
cmedia_list
);
}
module_init
(
patch_cmedia_init
)
module_exit
(
patch_cmedia_exit
)
sound/pci/hda/patch_conexant.c
浏览文件 @
0640f84f
...
...
@@ -27,7 +27,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
#define CXT_PIN_DIR_IN 0x00
#define CXT_PIN_DIR_OUT 0x01
...
...
@@ -1771,7 +1770,7 @@ static int patch_cxt5051(struct hda_codec *codec)
/*
*/
struct
hda_codec_preset
snd_hda_preset_conexant
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_conexant
[]
=
{
{
.
id
=
0x14f15045
,
.
name
=
"CX20549 (Venice)"
,
.
patch
=
patch_cxt5045
},
{
.
id
=
0x14f15047
,
.
name
=
"CX20551 (Waikiki)"
,
...
...
@@ -1780,3 +1779,28 @@ struct hda_codec_preset snd_hda_preset_conexant[] = {
.
patch
=
patch_cxt5051
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:14f15045"
);
MODULE_ALIAS
(
"snd-hda-codec-id:14f15047"
);
MODULE_ALIAS
(
"snd-hda-codec-id:14f15051"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Conexant HD-audio codec"
);
static
struct
hda_codec_preset_list
conexant_list
=
{
.
preset
=
snd_hda_preset_conexant
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_conexant_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
conexant_list
);
}
static
void
__exit
patch_conexant_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
conexant_list
);
}
module_init
(
patch_conexant_init
)
module_exit
(
patch_conexant_exit
)
sound/pci/hda/patch_intelhdmi.c
浏览文件 @
0640f84f
...
...
@@ -32,7 +32,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
#define CVT_NID 0x02
/* audio converter */
#define PIN_NID 0x03
/* HDMI output pin */
...
...
@@ -675,7 +674,7 @@ static int patch_intel_hdmi(struct hda_codec *codec)
return
0
;
}
struct
hda_codec_preset
snd_hda_preset_intelhdmi
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_intelhdmi
[]
=
{
{
.
id
=
0x808629fb
,
.
name
=
"INTEL G45 DEVCL"
,
.
patch
=
patch_intel_hdmi
},
{
.
id
=
0x80862801
,
.
name
=
"INTEL G45 DEVBLC"
,
.
patch
=
patch_intel_hdmi
},
{
.
id
=
0x80862802
,
.
name
=
"INTEL G45 DEVCTG"
,
.
patch
=
patch_intel_hdmi
},
...
...
@@ -683,3 +682,30 @@ struct hda_codec_preset snd_hda_preset_intelhdmi[] = {
{
.
id
=
0x10951392
,
.
name
=
"SiI1392 HDMI"
,
.
patch
=
patch_intel_hdmi
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:808629fb"
);
MODULE_ALIAS
(
"snd-hda-codec-id:80862801"
);
MODULE_ALIAS
(
"snd-hda-codec-id:80862802"
);
MODULE_ALIAS
(
"snd-hda-codec-id:80862803"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10951392"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Intel HDMI HD-audio codec"
);
static
struct
hda_codec_preset_list
intel_list
=
{
.
preset
=
snd_hda_preset_intelhdmi
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_intelhdmi_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
intel_list
);
}
static
void
__exit
patch_intelhdmi_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
intel_list
);
}
module_init
(
patch_intelhdmi_init
)
module_exit
(
patch_intelhdmi_exit
)
sound/pci/hda/patch_nvhdmi.c
浏览文件 @
0640f84f
...
...
@@ -28,7 +28,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
struct
nvhdmi_spec
{
struct
hda_multi_out
multiout
;
...
...
@@ -159,8 +158,32 @@ static int patch_nvhdmi(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_nvhdmi
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_nvhdmi
[]
=
{
{
.
id
=
0x10de0002
,
.
name
=
"NVIDIA MCP78 HDMI"
,
.
patch
=
patch_nvhdmi
},
{
.
id
=
0x10de0007
,
.
name
=
"NVIDIA MCP7A HDMI"
,
.
patch
=
patch_nvhdmi
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:10de0002"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10de0007"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Nvidia HDMI HD-audio codec"
);
static
struct
hda_codec_preset_list
nvhdmi_list
=
{
.
preset
=
snd_hda_preset_nvhdmi
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_nvhdmi_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
nvhdmi_list
);
}
static
void
__exit
patch_nvhdmi_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
nvhdmi_list
);
}
module_init
(
patch_nvhdmi_init
)
module_exit
(
patch_nvhdmi_exit
)
sound/pci/hda/patch_realtek.c
浏览文件 @
0640f84f
...
...
@@ -30,7 +30,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
#define ALC880_FRONT_EVENT 0x01
#define ALC880_DCVOL_EVENT 0x02
...
...
@@ -16613,7 +16612,7 @@ static int patch_alc662(struct hda_codec *codec)
/*
* patch entries
*/
struct hda_codec_preset snd_hda_preset_realtek[] = {
st
atic st
ruct hda_codec_preset snd_hda_preset_realtek[] = {
{ .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
{ .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
{ .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
...
...
@@ -16645,3 +16644,26 @@ struct hda_codec_preset snd_hda_preset_realtek[] = {
{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },
{} /* terminator */
};
MODULE_ALIAS("snd-hda-codec-id:10ec*");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Realtek HD-audio codec");
static struct hda_codec_preset_list realtek_list = {
.preset = snd_hda_preset_realtek,
.owner = THIS_MODULE,
};
static int __init patch_realtek_init(void)
{
return snd_hda_add_codec_preset(&realtek_list);
}
static void __exit patch_realtek_exit(void)
{
snd_hda_delete_codec_preset(&realtek_list);
}
module_init(patch_realtek_init)
module_exit(patch_realtek_exit)
sound/pci/hda/patch_si3054.c
浏览文件 @
0640f84f
...
...
@@ -28,7 +28,6 @@
#include <sound/core.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
/* si3054 verbs */
#define SI3054_VERB_READ_NODE 0x900
...
...
@@ -283,7 +282,7 @@ static int patch_si3054(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_si3054
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_si3054
[]
=
{
{
.
id
=
0x163c3055
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x163c3155
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x11c13026
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
...
...
@@ -301,3 +300,35 @@ struct hda_codec_preset snd_hda_preset_si3054[] = {
{}
};
MODULE_ALIAS
(
"snd-hda-codec-id:163c3055"
);
MODULE_ALIAS
(
"snd-hda-codec-id:163c3155"
);
MODULE_ALIAS
(
"snd-hda-codec-id:11c13026"
);
MODULE_ALIAS
(
"snd-hda-codec-id:11c13055"
);
MODULE_ALIAS
(
"snd-hda-codec-id:11c13155"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10573055"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10573057"
);
MODULE_ALIAS
(
"snd-hda-codec-id:10573155"
);
MODULE_ALIAS
(
"snd-hda-codec-id:11063288"
);
MODULE_ALIAS
(
"snd-hda-codec-id:15433155"
);
MODULE_ALIAS
(
"snd-hda-codec-id:18540018"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Si3054 HD-audio modem codec"
);
static
struct
hda_codec_preset_list
si3054_list
=
{
.
preset
=
snd_hda_preset_si3054
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_si3054_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
si3054_list
);
}
static
void
__exit
patch_si3054_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
si3054_list
);
}
module_init
(
patch_si3054_init
)
module_exit
(
patch_si3054_exit
)
sound/pci/hda/patch_sigmatel.c
浏览文件 @
0640f84f
...
...
@@ -33,7 +33,6 @@
#include <sound/jack.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
#include "hda_beep.h"
enum
{
...
...
@@ -5461,7 +5460,7 @@ static int patch_stac9872(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_sigmatel
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_sigmatel
[]
=
{
{
.
id
=
0x83847690
,
.
name
=
"STAC9200"
,
.
patch
=
patch_stac9200
},
{
.
id
=
0x83847882
,
.
name
=
"STAC9220 A1"
,
.
patch
=
patch_stac922x
},
{
.
id
=
0x83847680
,
.
name
=
"STAC9221 A1"
,
.
patch
=
patch_stac922x
},
...
...
@@ -5525,3 +5524,27 @@ struct hda_codec_preset snd_hda_preset_sigmatel[] = {
{
.
id
=
0x111d76b7
,
.
name
=
"92HD71B5X"
,
.
patch
=
patch_stac92hd71bxx
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:8384*"
);
MODULE_ALIAS
(
"snd-hda-codec-id:111d*"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"IDT/Sigmatel HD-audio codec"
);
static
struct
hda_codec_preset_list
sigmatel_list
=
{
.
preset
=
snd_hda_preset_sigmatel
,
.
owner
=
THIS_MODULE
,
};
static
int
__init
patch_sigmatel_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
sigmatel_list
);
}
static
void
__exit
patch_sigmatel_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
sigmatel_list
);
}
module_init
(
patch_sigmatel_init
)
module_exit
(
patch_sigmatel_exit
)
sound/pci/hda/patch_via.c
浏览文件 @
0640f84f
...
...
@@ -47,7 +47,6 @@
#include <sound/asoundef.h>
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
/* amp values */
#define AMP_VAL_IDX_SHIFT 19
...
...
@@ -3249,7 +3248,7 @@ static int patch_vt1702(struct hda_codec *codec)
/*
* patch entries
*/
struct
hda_codec_preset
snd_hda_preset_via
[]
=
{
st
atic
st
ruct
hda_codec_preset
snd_hda_preset_via
[]
=
{
{
.
id
=
0x11061708
,
.
name
=
"VIA VT1708"
,
.
patch
=
patch_vt1708
},
{
.
id
=
0x11061709
,
.
name
=
"VIA VT1708"
,
.
patch
=
patch_vt1708
},
{
.
id
=
0x1106170A
,
.
name
=
"VIA VT1708"
,
.
patch
=
patch_vt1708
},
...
...
@@ -3320,3 +3319,26 @@ struct hda_codec_preset snd_hda_preset_via[] = {
.
patch
=
patch_vt1702
},
{}
/* terminator */
};
MODULE_ALIAS
(
"snd-hda-codec-id:1106*"
);
static
struct
hda_codec_preset_list
via_list
=
{
.
preset
=
snd_hda_preset_via
,
.
owner
=
THIS_MODULE
,
};
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"VIA HD-audio codec"
);
static
int
__init
patch_via_init
(
void
)
{
return
snd_hda_add_codec_preset
(
&
via_list
);
}
static
void
__exit
patch_via_exit
(
void
)
{
snd_hda_delete_codec_preset
(
&
via_list
);
}
module_init
(
patch_via_init
)
module_exit
(
patch_via_exit
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录