[kernel] r16551 - in dists/sid/linux-2.6/debian: . patches/features/x86 patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Nov 15 02:10:56 UTC 2010
Author: benh
Date: Mon Nov 15 02:10:52 2010
New Revision: 16551
Log:
[x86] snd-hda-codec-cirrus: Add quirks for IMac 27", MacBookPro 5,5 and 7,1
Added:
dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch
dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-support-for-the-new-27-inch-IMacs.patch
dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-MacBookPro-5-3-line-in-support.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/28
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Mon Nov 15 01:39:28 2010 (r16550)
+++ dists/sid/linux-2.6/debian/changelog Mon Nov 15 02:10:52 2010 (r16551)
@@ -33,6 +33,7 @@
* brcm80211: Update to 2.6.37-rc1
* [powerpc] ALSA: Fix headphone and line-out detection on PowerMac G4 DA
(Closes: #603419)
+ * [x86] snd-hda-codec-cirrus: Add quirks for IMac 27", MacBookPro 5,5 and 7,1
[ dann frazier ]
* [vserver] Update patch to 2.6.32.25-vs2.3.0.36.29.6
Added: dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch Mon Nov 15 02:10:52 2010 (r16551)
@@ -0,0 +1,28 @@
+From f46119b73425df9d1e05c5d5e909a993d95b0218 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai at suse.de>
+Date: Mon, 11 Oct 2010 14:46:35 +0200
+Subject: [PATCH] ALSA: hda - Add model=mbp55 entry for MacBookPro 7,1
+
+Reference: Novell bnc#645066
+ https://bugzilla.novell.com/show_bug.cgi?id=645066
+
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/patch_cirrus.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
+index 5c00106..d9a3dbc 100644
+--- a/sound/pci/hda/patch_cirrus.c
++++ b/sound/pci/hda/patch_cirrus.c
+@@ -1140,6 +1140,7 @@ static const char *cs420x_models[CS420X_MODELS] = {
+ static struct snd_pci_quirk cs420x_cfg_tbl[] = {
+ SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
+ SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
++ SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
+ SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
+ {} /* terminator */
+ };
+--
+1.7.2.3
+
Added: dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-support-for-the-new-27-inch-IMacs.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-support-for-the-new-27-inch-IMacs.patch Mon Nov 15 02:10:52 2010 (r16551)
@@ -0,0 +1,103 @@
+From 1a5ba2e9fc7999b8de2a71c7e7b9f58d752c05e4 Mon Sep 17 00:00:00 2001
+From: Rafael Avila de Espindola <rafael.espindola at gmail.com>
+Date: Tue, 22 Dec 2009 07:59:37 +0100
+Subject: [PATCH] ALSA: hda - Add support for the new 27 inch IMacs
+
+With the attached patch I am able to use the sound on a new IMac 27.
+What works:
+
+*) Internal speakers
+*) Internal microphone
+*) Headphone
+
+I don't have an external mic or a SPDIF device to test the rest.
+
+Signed-off-by: Rafael Avila de Espindola <rafael.espindola at gmail.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ Documentation/sound/alsa/HD-Audio-Models.txt | 1 +
+ sound/pci/hda/patch_cirrus.c | 22 +++++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 1 deletions(-)
+
+diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
+index e93afff..e72cee9 100644
+--- a/Documentation/sound/alsa/HD-Audio-Models.txt
++++ b/Documentation/sound/alsa/HD-Audio-Models.txt
+@@ -403,4 +403,5 @@ STAC9872
+ Cirrus Logic CS4206/4207
+ ========================
+ mbp55 MacBook Pro 5,5
++ imac27 IMac 27 Inch
+ auto BIOS setup (default)
+diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
+index 4b200da..fe0423c 100644
+--- a/sound/pci/hda/patch_cirrus.c
++++ b/sound/pci/hda/patch_cirrus.c
+@@ -66,6 +66,7 @@ struct cs_spec {
+ /* available models */
+ enum {
+ CS420X_MBP55,
++ CS420X_IMAC27,
+ CS420X_AUTO,
+ CS420X_MODELS
+ };
+@@ -827,7 +828,8 @@ static void cs_automute(struct hda_codec *codec)
+ AC_VERB_SET_PIN_WIDGET_CONTROL,
+ hp_present ? 0 : PIN_OUT);
+ }
+- if (spec->board_config == CS420X_MBP55) {
++ if (spec->board_config == CS420X_MBP55 ||
++ spec->board_config == CS420X_IMAC27) {
+ unsigned int gpio = hp_present ? 0x02 : 0x08;
+ snd_hda_codec_write(codec, 0x01, 0,
+ AC_VERB_SET_GPIO_DATA, gpio);
+@@ -1069,12 +1071,14 @@ static int cs_parse_auto_config(struct hda_codec *codec)
+
+ static const char *cs420x_models[CS420X_MODELS] = {
+ [CS420X_MBP55] = "mbp55",
++ [CS420X_IMAC27] = "imac27",
+ [CS420X_AUTO] = "auto",
+ };
+
+
+ static struct snd_pci_quirk cs420x_cfg_tbl[] = {
+ SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
++ SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
+ {} /* terminator */
+ };
+
+@@ -1097,8 +1101,23 @@ static struct cs_pincfg mbp55_pincfgs[] = {
+ {} /* terminator */
+ };
+
++static struct cs_pincfg imac27_pincfgs[] = {
++ { 0x09, 0x012b4050 },
++ { 0x0a, 0x90100140 },
++ { 0x0b, 0x90100142 },
++ { 0x0c, 0x018b3020 },
++ { 0x0d, 0x90a00110 },
++ { 0x0e, 0x400000f0 },
++ { 0x0f, 0x01cbe030 },
++ { 0x10, 0x014be060 },
++ { 0x12, 0x01ab9070 },
++ { 0x15, 0x400000f0 },
++ {} /* terminator */
++};
++
+ static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
+ [CS420X_MBP55] = mbp55_pincfgs,
++ [CS420X_IMAC27] = imac27_pincfgs,
+ };
+
+ static void fix_pincfg(struct hda_codec *codec, int model)
+@@ -1128,6 +1147,7 @@ static int patch_cs420x(struct hda_codec *codec)
+ fix_pincfg(codec, spec->board_config);
+
+ switch (spec->board_config) {
++ case CS420X_IMAC27:
+ case CS420X_MBP55:
+ /* GPIO1 = headphones */
+ /* GPIO3 = speakers */
+--
+1.7.2.3
+
Added: dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-MacBookPro-5-3-line-in-support.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/x86/ALSA-hda-MacBookPro-5-3-line-in-support.patch Mon Nov 15 02:10:52 2010 (r16551)
@@ -0,0 +1,94 @@
+From 4e7d7c6018567fa03f387d06602d4145c75ebbe0 Mon Sep 17 00:00:00 2001
+From: Vince Weaver <vweaver1 at eecs.utk.edu>
+Date: Wed, 22 Sep 2010 17:31:37 -0400
+Subject: [PATCH] ALSA: hda - MacBookPro 5,3 line-in support
+
+I've found the following patch is necessary to enable line-in on
+my MacBookPro 5,3 machine. With the patch applied I've successfully
+recorded audio from the line-in jack. This is based on the existing
+5,5 support.
+
+Signed-off-by: Vince Weaver <vweaver1 at eecs.utk.edu>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/patch_cirrus.c | 22 +++++++++++++++++++++-
+ 1 files changed, 21 insertions(+), 1 deletions(-)
+
+diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
+index 483c3f2..5c00106 100644
+--- a/sound/pci/hda/patch_cirrus.c
++++ b/sound/pci/hda/patch_cirrus.c
+@@ -65,6 +65,7 @@ struct cs_spec {
+
+ /* available models */
+ enum {
++ CS420X_MBP53,
+ CS420X_MBP55,
+ CS420X_IMAC27,
+ CS420X_AUTO,
+@@ -839,7 +840,8 @@ static void cs_automute(struct hda_codec *codec)
+ AC_VERB_SET_PIN_WIDGET_CONTROL,
+ hp_present ? 0 : PIN_OUT);
+ }
+- if (spec->board_config == CS420X_MBP55 ||
++ if (spec->board_config == CS420X_MBP53 ||
++ spec->board_config == CS420X_MBP55 ||
+ spec->board_config == CS420X_IMAC27) {
+ unsigned int gpio = hp_present ? 0x02 : 0x08;
+ snd_hda_codec_write(codec, 0x01, 0,
+@@ -1128,6 +1130,7 @@ static int cs_parse_auto_config(struct hda_codec *codec)
+ }
+
+ static const char *cs420x_models[CS420X_MODELS] = {
++ [CS420X_MBP53] = "mbp53",
+ [CS420X_MBP55] = "mbp55",
+ [CS420X_IMAC27] = "imac27",
+ [CS420X_AUTO] = "auto",
+@@ -1135,6 +1138,7 @@ static const char *cs420x_models[CS420X_MODELS] = {
+
+
+ static struct snd_pci_quirk cs420x_cfg_tbl[] = {
++ SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
+ SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
+ SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
+ {} /* terminator */
+@@ -1145,6 +1149,20 @@ struct cs_pincfg {
+ u32 val;
+ };
+
++static struct cs_pincfg mbp53_pincfgs[] = {
++ { 0x09, 0x012b4050 },
++ { 0x0a, 0x90100141 },
++ { 0x0b, 0x90100140 },
++ { 0x0c, 0x018b3020 },
++ { 0x0d, 0x90a00110 },
++ { 0x0e, 0x400000f0 },
++ { 0x0f, 0x01cbe030 },
++ { 0x10, 0x014be060 },
++ { 0x12, 0x400000f0 },
++ { 0x15, 0x400000f0 },
++ {} /* terminator */
++};
++
+ static struct cs_pincfg mbp55_pincfgs[] = {
+ { 0x09, 0x012b4030 },
+ { 0x0a, 0x90100121 },
+@@ -1174,6 +1192,7 @@ static struct cs_pincfg imac27_pincfgs[] = {
+ };
+
+ static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
++ [CS420X_MBP53] = mbp53_pincfgs,
+ [CS420X_MBP55] = mbp55_pincfgs,
+ [CS420X_IMAC27] = imac27_pincfgs,
+ };
+@@ -1206,6 +1225,7 @@ static int patch_cs420x(struct hda_codec *codec)
+
+ switch (spec->board_config) {
+ case CS420X_IMAC27:
++ case CS420X_MBP53:
+ case CS420X_MBP55:
+ /* GPIO1 = headphones */
+ /* GPIO3 = speakers */
+--
+1.7.2.3
+
Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28 Mon Nov 15 01:39:28 2010 (r16550)
+++ dists/sid/linux-2.6/debian/patches/series/28 Mon Nov 15 02:10:52 2010 (r16551)
@@ -19,3 +19,6 @@
+ features/all/qlcnic-driver.patch
+ bugfix/powerpc/ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch
+ bugfix/powerpc/ALSA-powermac-Lineout-detection-on-G4-DA.patch
++ features/x86/ALSA-hda-Add-support-for-the-new-27-inch-IMacs.patch
++ features/x86/ALSA-hda-MacBookPro-5-3-line-in-support.patch
++ features/x86/ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch
More information about the Kernel-svn-changes
mailing list