Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
e6845d91
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,发现更多精彩内容 >>
提交
e6845d91
编写于
2月 19, 2009
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/misc' into for-linus
上级
379752fd
6ce6c473
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
14 deletion
+5
-14
sound/core/jack.c
sound/core/jack.c
+1
-1
sound/pci/oxygen/virtuoso.c
sound/pci/oxygen/virtuoso.c
+4
-13
未找到文件。
sound/core/jack.c
浏览文件 @
e6845d91
...
...
@@ -47,7 +47,7 @@ static int snd_jack_dev_register(struct snd_device *device)
int
err
;
snprintf
(
jack
->
name
,
sizeof
(
jack
->
name
),
"%s %s"
,
card
->
long
name
,
jack
->
id
);
card
->
short
name
,
jack
->
id
);
jack
->
input_dev
->
name
=
jack
->
name
;
/* Default to the sound card device. */
...
...
sound/pci/oxygen/virtuoso.c
浏览文件 @
e6845d91
...
...
@@ -26,7 +26,7 @@
* SPI 0 -> 1st PCM1796 (front)
* SPI 1 -> 2nd PCM1796 (surround)
* SPI 2 -> 3rd PCM1796 (center/LFE)
* SPI 4 -> 4th PCM1796 (back)
and EEPROM self-destruct (do not use!)
* SPI 4 -> 4th PCM1796 (back)
*
* GPIO 2 -> M0 of CS5381
* GPIO 3 -> M1 of CS5381
...
...
@@ -207,12 +207,6 @@ static void xonar_gpio_changed(struct oxygen *chip);
static
inline
void
pcm1796_write_spi
(
struct
oxygen
*
chip
,
unsigned
int
codec
,
u8
reg
,
u8
value
)
{
/*
* We don't want to do writes on SPI 4 because the EEPROM, which shares
* the same pin, might get confused and broken. We'd better take care
* that the driver works with the default register values ...
*/
#if 0
/* maps ALSA channel pair number to SPI output */
static
const
u8
codec_map
[
4
]
=
{
0
,
1
,
2
,
4
...
...
@@ -223,7 +217,6 @@ static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
(
codec_map
[
codec
]
<<
OXYGEN_SPI_CODEC_SHIFT
)
|
OXYGEN_SPI_CEN_LATCH_CLOCK_HI
,
(
reg
<<
8
)
|
value
);
#endif
}
static
inline
void
pcm1796_write_i2c
(
struct
oxygen
*
chip
,
unsigned
int
codec
,
...
...
@@ -757,9 +750,6 @@ static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0);
static
int
xonar_d2_control_filter
(
struct
snd_kcontrol_new
*
template
)
{
if
(
!
strncmp
(
template
->
name
,
"Master Playback "
,
16
))
/* disable volume/mute because they would require SPI writes */
return
1
;
if
(
!
strncmp
(
template
->
name
,
"CD Capture "
,
11
))
/* CD in is actually connected to the video in pin */
template
->
private_value
^=
AC97_CD
^
AC97_VIDEO
;
...
...
@@ -850,8 +840,9 @@ static const struct oxygen_model model_xonar_d2 = {
.
dac_volume_min
=
0x0f
,
.
dac_volume_max
=
0xff
,
.
misc_flags
=
OXYGEN_MISC_MIDI
,
.
function_flags
=
OXYGEN_FUNCTION_SPI
,
.
dac_i2s_format
=
OXYGEN_I2S_FORMAT_I2S
,
.
function_flags
=
OXYGEN_FUNCTION_SPI
|
OXYGEN_FUNCTION_ENABLE_SPI_4_5
,
.
dac_i2s_format
=
OXYGEN_I2S_FORMAT_LJUST
,
.
adc_i2s_format
=
OXYGEN_I2S_FORMAT_LJUST
,
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录