* [PATCH 6/6] MacBookAir3,1(3,2) alsa support
@ 2010-11-02 7:21 gimli
2010-11-02 15:30 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: gimli @ 2010-11-02 7:21 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa
sound system.
Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>
[-- Attachment #2: snd_hda_macbookair.patch --]
[-- Type: text/plain, Size: 439 bytes --]
--- a/sound/pci/hda/patch_cirrus.c 2010-10-29 08:30:04.029681004 +0200
+++ b/sound/pci/hda/patch_cirrus.c 2010-10-29 08:34:04.509681003 +0200
@@ -1089,6 +1089,7 @@
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),
+ SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
{} /* terminator */
};
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 6/6] MacBookAir3,1(3,2) alsa support 2010-11-02 7:21 [PATCH 6/6] MacBookAir3,1(3,2) alsa support gimli @ 2010-11-02 15:30 ` Takashi Iwai 2010-11-02 20:34 ` gimli 0 siblings, 1 reply; 4+ messages in thread From: Takashi Iwai @ 2010-11-02 15:30 UTC (permalink / raw) To: gimli; +Cc: linux-kernel At Tue, 02 Nov 2010 08:21:51 +0100, gimli wrote: > > This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa > sound system. > > Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com> The patch isn't applicable to the latest upstream code. Could you rebase your patch to 2.6.37-rc1? thanks, Takashi > [2 snd_hda_macbookair.patch <text/plain; UTF-8 (base64)>] > --- a/sound/pci/hda/patch_cirrus.c 2010-10-29 08:30:04.029681004 +0200 > +++ b/sound/pci/hda/patch_cirrus.c 2010-10-29 08:34:04.509681003 +0200 > @@ -1089,6 +1089,7 @@ > 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), > + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), > {} /* terminator */ > }; > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 6/6] MacBookAir3,1(3,2) alsa support 2010-11-02 15:30 ` Takashi Iwai @ 2010-11-02 20:34 ` gimli 2010-11-03 9:01 ` Takashi Iwai 0 siblings, 1 reply; 4+ messages in thread From: gimli @ 2010-11-02 20:34 UTC (permalink / raw) To: Takashi Iwai; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 1007 bytes --] Rebased to 2.6.37-rc1 Signed-off-by: Edgar (gimli) Hucek<gimli@dark-green.com> Am 02.11.10 16:30, schrieb Takashi Iwai: > At Tue, 02 Nov 2010 08:21:51 +0100, > gimli wrote: >> >> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa >> sound system. >> >> Signed-off-by: Edgar (gimli) Hucek<gimli@dark-green.com> > > The patch isn't applicable to the latest upstream code. > Could you rebase your patch to 2.6.37-rc1? > > > thanks, > > Takashi > > >> [2 snd_hda_macbookair.patch<text/plain; UTF-8 (base64)>] >> --- a/sound/pci/hda/patch_cirrus.c 2010-10-29 08:30:04.029681004 +0200 >> +++ b/sound/pci/hda/patch_cirrus.c 2010-10-29 08:34:04.509681003 +0200 >> @@ -1089,6 +1089,7 @@ >> 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), >> + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), >> {} /* terminator */ >> }; >> > [-- Attachment #2: snd_hda_macbookair.patch --] [-- Type: text/plain, Size: 602 bytes --] diff -uNr linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c --- linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c 2010-11-02 21:27:10.000000000 +0100 +++ linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c 2010-11-02 21:28:53.000000000 +0100 @@ -1169,6 +1169,7 @@ 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), + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), {} /* terminator */ }; ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 6/6] MacBookAir3,1(3,2) alsa support 2010-11-02 20:34 ` gimli @ 2010-11-03 9:01 ` Takashi Iwai 0 siblings, 0 replies; 4+ messages in thread From: Takashi Iwai @ 2010-11-03 9:01 UTC (permalink / raw) To: gimli; +Cc: linux-kernel At Tue, 02 Nov 2010 21:34:04 +0100, gimli wrote: > > [1 <text/plain; ISO-8859-1 (7bit)>] > Rebased to 2.6.37-rc1 > > Signed-off-by: Edgar (gimli) Hucek<gimli@dark-green.com> Applied now. (But at the next time, it'd be helpful if you prepare a new patch again after rebase so that it can be applied directly via git-am.) Thanks, Takashi > Am 02.11.10 16:30, schrieb Takashi Iwai: > > At Tue, 02 Nov 2010 08:21:51 +0100, > > gimli wrote: > >> > >> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa > >> sound system. > >> > >> Signed-off-by: Edgar (gimli) Hucek<gimli@dark-green.com> > > > > The patch isn't applicable to the latest upstream code. > > Could you rebase your patch to 2.6.37-rc1? > > > > > > thanks, > > > > Takashi > > > > > >> [2 snd_hda_macbookair.patch<text/plain; UTF-8 (base64)>] > >> --- a/sound/pci/hda/patch_cirrus.c 2010-10-29 08:30:04.029681004 +0200 > >> +++ b/sound/pci/hda/patch_cirrus.c 2010-10-29 08:34:04.509681003 +0200 > >> @@ -1089,6 +1089,7 @@ > >> 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), > >> + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), > >> {} /* terminator */ > >> }; > >> > > > > [2 snd_hda_macbookair.patch <text/plain (7bit)>] > diff -uNr linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c > --- linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c 2010-11-02 21:27:10.000000000 +0100 > +++ linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c 2010-11-02 21:28:53.000000000 +0100 > @@ -1169,6 +1169,7 @@ > 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), > + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), > {} /* terminator */ > }; > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-03 9:01 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-02 7:21 [PATCH 6/6] MacBookAir3,1(3,2) alsa support gimli 2010-11-02 15:30 ` Takashi Iwai 2010-11-02 20:34 ` gimli 2010-11-03 9:01 ` Takashi Iwai
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox