sys-kernel/geos_one-sources: integrate alsa 1.0.18a with xa3530 patch
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@721 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
97155142b3
commit
08ffbf8a45
@ -2,6 +2,11 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
28 Jan 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/alsa-driver-1.0.18a-xa3530.patch,
|
||||
+files/alsa-driver-1.0.19-input.patch, geos_one-sources-2.6.28-r1.ebuild:
|
||||
integrate alsa 1.0.18a with xa3530 patch
|
||||
|
||||
27 Jan 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/fix-unionfs-for-2.6.28.1.patch,
|
||||
+files/fix-reiser4-for-2.6.28.1.patch, geos_one-sources-2.6.28-r1.ebuild:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
AUX alsa-driver-1.0.18a-xa3530.patch 14509 RMD160 7b64bd5303d4e646957c1e49a53adfb012b3de8e SHA1 148a444560bb9473325147d44a6f813b084d4819 SHA256 6236e6e64d09284c13f16aaefb20e54e891d5b7f1d93cdb64cf5d6901f94761c
|
||||
AUX alsa-driver-1.0.19-input.patch 608 RMD160 be8e1f14e5a7ec33102a87dc2fd443a8b49ba329 SHA1 0d4f66a40ccebc034c859b3fd4ff34e436cf4d41 SHA256 414dc3663be345c42e34c3c44087e1b316e67eea6b7979c447effd39e05a8652
|
||||
AUX colored-printk-2.6.26.patch 11265 RMD160 1e520168b8813754906513317f5c683dbec2b31b SHA1 d321509ccc286b29b8c0fac9ae18205705fea332 SHA256 e8afce0c43cd534a6f707dc9f8769d0ba03322efccd55e3dc3edc3375e44c4ba
|
||||
AUX fix-reiser4-for-2.6.28.1.patch 396 RMD160 fc8874e25e2e66d58a49dd6775e483feab8b36e4 SHA1 97f49e0d228bdb590493cb4f07650ab0525133af SHA256 3b2c79070f580003b4fc5229999aff2f871a31997ca6fd65c9688bcb1cb05d0c
|
||||
AUX fix-unionfs-for-2.6.28.1.patch 407 RMD160 62a5c00e357faea5dd802dae40ceff46d2a3b7b2 SHA1 1b4d1c1eb151ea2d4b4d77de37ba05eb1291bad5 SHA256 0c7220bec0afdebf735fa8cd61ab39d72cebdfeb3e17ac3ee9cae5a03350d73e
|
||||
@ -10,6 +12,7 @@ DIST UnionFS_2.5-AppArmor_2.3.patch 10524 RMD160 808fce3fb3eb2f7d98ed95b654f4490
|
||||
DIST UnionFS_2.5.1-AppArmor_2.3.patch 10524 RMD160 808fce3fb3eb2f7d98ed95b654f44908ed5d8e19 SHA1 727db0d207a308bfccf7ad547f4976aa50a1ccaf SHA256 5fa66d26774d388c643151bb975e65354e5c7193dfc0ac3a83ff761bed18eba1
|
||||
DIST acpi-dsdt-initrd-v0.9c-2.6.26.patch 10058 RMD160 f568e92e79d95892e8e56396f83b2628bd34fd6e SHA1 0581b78d842ba8ba4a3be58974a2abbcf67124a2 SHA256 4c63609b13ea1a4abbd27e173c96cdd62faa51758e934607403471c518a7290f
|
||||
DIST acpi-dsdt-initrd-v0.9c-2.6.28.patch 9992 RMD160 3d29ad2cdc6232282a85569979368c85a76879b1 SHA1 a219e0896346936a402d6f188174271d8e706eff SHA256 286a88dd244addc0f0bab1b8cb20cd435a471c1927b55220e892bdec1a0ea759
|
||||
DIST alsa-driver-1.0.18a.tar.bz2 2833780 RMD160 c06c0b68999802da80becb58ea86596f031fa406 SHA1 c8ca0d2f9093f697ee519c45c13dd7d166f6fb2a SHA256 31148e6722da1ffbbc96504a106ef2f9a06cfcc0843c3306996d4379abaff833
|
||||
DIST genpatches-2.6.27-4.base.tar.bz2 23928 RMD160 d50a94ec3038dd80d38a52d139f2f4185792df49 SHA1 b671e45b169920b7b6b056ec373620e2df840358 SHA256 d0c321279ce26750cd159a5d4a736182dca871fb12574f256786df03e99f12f6
|
||||
DIST genpatches-2.6.27-4.extras.tar.bz2 41456 RMD160 bd6e5fc57d4895c23401f22892f630097174aead SHA1 35a86799ee1d4f55e347b2f01f64e4abbda8a7ae SHA256 384ecb94815261a960dd57b942206d73e2a7ad0e4d883400860a47f01573bd41
|
||||
DIST genpatches-2.6.27-5.base.tar.bz2 66486 RMD160 3ca48c4498fc9847aa25fd4892f7b22488bf5088 SHA1 69871df039a229e53313c46174587c804cda4fb6 SHA256 2c479c575a7c5d40f87e87b38152ea9de37b3f4ca2e1df398d22de37e5eec05d
|
||||
@ -38,7 +41,7 @@ EBUILD geos_one-sources-2.6.27-r4.ebuild 3191 RMD160 310291b7ef6d9015128e5cc04e2
|
||||
EBUILD geos_one-sources-2.6.27-r5.ebuild 3268 RMD160 fe08f99491a001054194a78df6aa3f89d23e41f0 SHA1 4c14a4f4765a82eebaa29433bcdf189ee342b1dd SHA256 48dbf7e70fd3caa2b99272173afc94119298278f14a7c3bac7bb93c29437e233
|
||||
EBUILD geos_one-sources-2.6.27-r7.ebuild 2924 RMD160 425863b77e2fc04cca9051061dcdc9c34588ce4f SHA1 f62de54668415fd45d880a1fccd9702c4d0db9f2 SHA256 03a34dd1bae6de85243ca1c3e2bbb494a59ee11042f6d443c87513c42d8eb58b
|
||||
EBUILD geos_one-sources-2.6.27.ebuild 2821 RMD160 8cddc77851562dcdd261fdda1a98b416a8539cdb SHA1 87f501974802d83ef142114c01c1b7c9dea27a59 SHA256 20cb29a2fcc71d86f85232d092a1339f02f13ac042c570af632d026bad024d54
|
||||
EBUILD geos_one-sources-2.6.28-r1.ebuild 2906 RMD160 1d8b8ab1a01e961bdfee86d70821a9f370a5ac37 SHA1 3c9f2b36e8912d76084a9dc83d65c018fa6b11a2 SHA256 9887a52c56c14d826919d6964df08dc0fca616c2f31cebaa72d634546325884d
|
||||
EBUILD geos_one-sources-2.6.28-r1.ebuild 3549 RMD160 570415f9a17d382fe241bfe9a2a608c513406de6 SHA1 077f2e58af56f3ac6289b82e41331f4651a80283 SHA256 f58d35c912cc1545baea8b8f75ee2c1d2571692f19c8c8e78ef7466a394b91be
|
||||
EBUILD geos_one-sources-2.6.28.ebuild 2724 RMD160 59ef67d038f90f54f7ad0224263fe3b8309db45d SHA1 f1e32cf7640706c4843679339d1774bbf89bed45 SHA256 dcb53c7bdbe81d51d74cc5f82e6efbade931fd33e962fd37cf71e7800d5d257c
|
||||
MISC ChangeLog 4067 RMD160 f89d4251ac3a083853c710e9f9fef14ad1af5c50 SHA1 637eb369a6fe810fdff8a0c2a03ab344ce90986e SHA256 8c2fbe2a26b05d9b6e8f43deb7a96f452ad1468916ffcf603c95c3dd54263552
|
||||
MISC ChangeLog 4281 RMD160 6b2c8c60d345741322297c1409367aa7b751bf4a SHA1 f5a5e28393e1f7d64f53f408ceac7135105eed31 SHA256 74a78b8d4e5dc817602c00b65ffe3845cd5cb77747fdba72cfd69a4a4a04952c
|
||||
MISC metadata.xml 413 RMD160 7e4e48d47e48804072f4ce93e1948fda82433a90 SHA1 cd61cf36ba79f6635ab7b7957f31609ecf52cc90 SHA256 74fe6520890eaf800a1759f3e4f772fd0e433e5de9cf775a50c7af95b199518b
|
||||
|
||||
@ -0,0 +1,416 @@
|
||||
diff -uNr alsa-driver-1.0.18a.orig/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.18a/alsa-kernel/pci/hda/patch_realtek.c
|
||||
--- alsa-driver-1.0.18a.orig/alsa-kernel/pci/hda/patch_realtek.c 2008-11-12 11:02:25.000000000 +0100
|
||||
+++ alsa-driver-1.0.18a/alsa-kernel/pci/hda/patch_realtek.c 2008-12-04 21:43:59.000000000 +0100
|
||||
@@ -216,6 +216,7 @@
|
||||
ALC883_TARGA_2ch_DIG,
|
||||
ALC883_ACER,
|
||||
ALC883_ACER_ASPIRE,
|
||||
+ ALC888_ACER_ASPIRE_4930G,
|
||||
ALC883_MEDION,
|
||||
ALC883_MEDION_MD2,
|
||||
ALC883_LAPTOP_EAPD,
|
||||
@@ -229,9 +230,11 @@
|
||||
ALC883_MITAC,
|
||||
ALC883_CLEVO_M720,
|
||||
ALC883_FUJITSU_PI2515,
|
||||
+ ALC888_FUJITSU_XA3530,
|
||||
ALC883_3ST_6ch_INTEL,
|
||||
ALC888_ASUS_M90V,
|
||||
ALC888_ASUS_EEE1601,
|
||||
+ ALC1200_ASUS_P5Q,
|
||||
ALC883_AUTO,
|
||||
ALC883_MODEL_LAST,
|
||||
};
|
||||
@@ -381,11 +384,15 @@
|
||||
{
|
||||
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
||||
struct alc_spec *spec = codec->spec;
|
||||
- const struct hda_input_mux *imux = spec->input_mux;
|
||||
+ const struct hda_input_mux *imux;
|
||||
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
|
||||
+ unsigned int mux_idx;
|
||||
hda_nid_t nid = spec->capsrc_nids ?
|
||||
spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];
|
||||
|
||||
+ mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
|
||||
+ imux = &spec->input_mux[mux_idx];
|
||||
+
|
||||
if (spec->is_mix_capture) {
|
||||
/* Matrix-mixer style (e.g. ALC882) */
|
||||
unsigned int *cur_val = &spec->cur_mux[adc_idx];
|
||||
@@ -406,10 +413,7 @@
|
||||
return 1;
|
||||
} else {
|
||||
/* MUX style (e.g. ALC880) */
|
||||
- unsigned int mux_idx;
|
||||
- mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
|
||||
- return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx],
|
||||
- ucontrol, nid,
|
||||
+ return snd_hda_input_mux_put(codec, imux, ucontrol, nid,
|
||||
&spec->cur_mux[adc_idx]);
|
||||
}
|
||||
}
|
||||
@@ -1153,6 +1157,226 @@
|
||||
}
|
||||
|
||||
/*
|
||||
+ * ALC888
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * 2ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch2_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Line in */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 4ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch4_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 6ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch6_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as CLFE (workaround because Mic-in is not loud enough) */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 8ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch8_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Side */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
|
||||
+ { 2, alc888_4ST_ch2_intel_init },
|
||||
+ { 4, alc888_4ST_ch4_intel_init },
|
||||
+ { 6, alc888_4ST_ch6_intel_init },
|
||||
+ { 8, alc888_4ST_ch8_intel_init },
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Fujitsu Siemens Amillo xa3530
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Connect Internal HP to Front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Bass HP to Front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Line-Out side jack (SPDIF) to Side */
|
||||
+ {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+/* Connect Mic jack to CLFE */
|
||||
+ {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x18, AC_VERB_SET_CONNECT_SEL, 0x02},
|
||||
+/* Connect Line-in jack to Surround */
|
||||
+ {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
+/* Connect HP out jack to Front */
|
||||
+ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Enable unsolicited event for HP jack and Line-out jack */
|
||||
+ {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ /* Line out presence */
|
||||
+ present = snd_hda_codec_read(codec, 0x17, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ /* HP out presence */
|
||||
+ present = present || snd_hda_codec_read(codec, 0x1b, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ /* Toggle internal speakers muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+ /* Toggle internal bass muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_fujitsu_xa3530_automute(codec);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Acer Aspire 4930G model
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Unselect Front Mic by default in input mixer 3 */
|
||||
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},
|
||||
+/* Enable unsolicited event for HP jack */
|
||||
+ {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+/* Connect Internal HP to front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect HP out to front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct hda_input_mux alc888_2_capture_sources[2] = {
|
||||
+ /* Front mic only available on one ADC */
|
||||
+ {
|
||||
+ .num_items = 4,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ { "Front Mic", 0xb },
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
+ .num_items = 3,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ },
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct snd_kcontrol_new alc888_base_mixer[] = {
|
||||
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
|
||||
+ HDA_OUTPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
||||
+ HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ present = snd_hda_codec_read(codec, 0x15, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_acer_aspire_4930g_automute(codec);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* ALC880 3-stack model
|
||||
*
|
||||
* DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)
|
||||
@@ -6868,6 +7092,8 @@
|
||||
#define ALC883_DIGOUT_NID 0x06
|
||||
#define ALC883_DIGIN_NID 0x0a
|
||||
|
||||
+#define ALC1200_DIGOUT_NID 0x10
|
||||
+
|
||||
static hda_nid_t alc883_dac_nids[4] = {
|
||||
/* front, rear, clfe, rear_surr */
|
||||
0x02, 0x03, 0x04, 0x05
|
||||
@@ -6883,8 +7109,15 @@
|
||||
0x08,
|
||||
};
|
||||
|
||||
+static hda_nid_t alc883_adc_nids_rev[2] = {
|
||||
+ /* ADC2-1 */
|
||||
+ 0x09, 0x08
|
||||
+};
|
||||
+
|
||||
static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
|
||||
|
||||
+static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
|
||||
+
|
||||
/* input MUX */
|
||||
/* FIXME: should be a matrix-type input source selection */
|
||||
|
||||
@@ -8176,6 +8409,7 @@
|
||||
[ALC883_TARGA_2ch_DIG] = "targa-2ch-dig",
|
||||
[ALC883_ACER] = "acer",
|
||||
[ALC883_ACER_ASPIRE] = "acer-aspire",
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g",
|
||||
[ALC883_MEDION] = "medion",
|
||||
[ALC883_MEDION_MD2] = "medion-md2",
|
||||
[ALC883_LAPTOP_EAPD] = "laptop-eapd",
|
||||
@@ -8189,7 +8423,9 @@
|
||||
[ALC883_MITAC] = "mitac",
|
||||
[ALC883_CLEVO_M720] = "clevo-m720",
|
||||
[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",
|
||||
+ [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",
|
||||
[ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel",
|
||||
+ [ALC1200_ASUS_P5Q] = "asus-p5q",
|
||||
[ALC883_AUTO] = "auto",
|
||||
};
|
||||
|
||||
@@ -8200,6 +8436,8 @@
|
||||
SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
|
||||
SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
|
||||
SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
|
||||
+ SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",
|
||||
+ ALC888_ACER_ASPIRE_4930G),
|
||||
SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
|
||||
SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
|
||||
SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
|
||||
@@ -8208,6 +8446,7 @@
|
||||
SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
|
||||
SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
|
||||
+ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),
|
||||
SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
|
||||
SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
|
||||
@@ -8245,6 +8484,7 @@
|
||||
SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
|
||||
SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
|
||||
SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
|
||||
+ SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", ALC888_FUJITSU_XA3530),
|
||||
SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
|
||||
SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
@@ -8370,6 +8610,26 @@
|
||||
.unsol_event = alc883_acer_aspire_unsol_event,
|
||||
.init_hook = alc883_acer_aspire_automute,
|
||||
},
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = {
|
||||
+ .mixers = { alc888_base_mixer,
|
||||
+ alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
|
||||
+ alc888_acer_aspire_4930g_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
|
||||
+ .channel_mode = alc883_3ST_6ch_modes,
|
||||
+ .need_dac_fix = 1,
|
||||
+ .num_mux_defs =
|
||||
+ ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_acer_aspire_4930g_unsol_event,
|
||||
+ .init_hook = alc888_acer_aspire_4930g_automute,
|
||||
+ },
|
||||
[ALC883_MEDION] = {
|
||||
.mixers = { alc883_fivestack_mixer,
|
||||
alc883_chmode_mixer },
|
||||
@@ -8513,6 +8773,23 @@
|
||||
.unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event,
|
||||
.init_hook = alc883_2ch_fujitsu_pi2515_automute,
|
||||
},
|
||||
+ [ALC888_FUJITSU_XA3530] = {
|
||||
+ .mixers = { alc888_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc888_fujitsu_xa3530_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes),
|
||||
+ .channel_mode = alc888_4ST_8ch_intel_modes,
|
||||
+ .num_mux_defs =
|
||||
+ ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_fujitsu_xa3530_unsol_event,
|
||||
+ .init_hook = alc888_fujitsu_xa3530_automute,
|
||||
+ },
|
||||
[ALC888_LENOVO_SKY] = {
|
||||
.mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer },
|
||||
.init_verbs = { alc883_init_verbs, alc888_lenovo_sky_verbs},
|
||||
@@ -8555,6 +8832,17 @@
|
||||
.unsol_event = alc883_eee1601_unsol_event,
|
||||
.init_hook = alc883_eee1601_inithook,
|
||||
},
|
||||
+ [ALC1200_ASUS_P5Q] = {
|
||||
+ .mixers = { alc883_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .dig_out_nid = ALC1200_DIGOUT_NID,
|
||||
+ .dig_in_nid = ALC883_DIGIN_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
|
||||
+ .channel_mode = alc883_sixstack_modes,
|
||||
+ .input_mux = &alc883_capture_source,
|
||||
+ },
|
||||
};
|
||||
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
--- linux-2.6.28-geos_one-r1/include/linux/input.h.orig 2008-12-25 00:26:37.000000000 +0100
|
||||
+++ linux-2.6.28-geos_one-r1/include/linux/input.h 2009-01-28 00:47:35.941439136 +0100
|
||||
@@ -659,6 +659,9 @@
|
||||
#define SW_RADIO SW_RFKILL_ALL /* deprecated */
|
||||
#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */
|
||||
#define SW_DOCK 0x05 /* set = plugged into dock */
|
||||
+#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
|
||||
+#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */
|
||||
+#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */
|
||||
#define SW_MAX 0x0f
|
||||
#define SW_CNT (SW_MAX+1)
|
||||
|
||||
@ -15,6 +15,7 @@ DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5.1"
|
||||
UNION_KV="2.6.28.1"
|
||||
COL_PRINTK_KV="2.6.26"
|
||||
ALSA_VER="1.0.18a"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
@ -34,8 +35,9 @@ TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
ALSA_SRC="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC}"
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${ALSA_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
@ -44,6 +46,12 @@ src_unpack() {
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir alsa
|
||||
cd alsa
|
||||
unpack "alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.18a-xa3530.patch
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
@ -52,6 +60,16 @@ src_unpack() {
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
einfo "integrating ALSA ${ALSA_VER}"
|
||||
# rm -rf sound/pci/hda/*
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/* sound/
|
||||
rm -rf sound/include
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/include/* include/sound/
|
||||
rm -rf sound/Documentation
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/Documentation/* Documentation
|
||||
rm -rf sound/scripts
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.19-input.patch
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${FILESDIR}/fix-reiser4-for-2.6.28.1.patch
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user