diff mbox

[karmic,resubmit] ALSA: hda - Add support for new AMD HD audio devices

Message ID 4AB7D793.4090107@canonical.com
State Accepted
Headers show

Commit Message

Surbhi Palande Sept. 21, 2009, 7:44 p.m. UTC 
Dear All,


Andy Whitcroft wrote:
> On Mon, Sep 21, 2009 at 11:52:46AM -0700, Surbhi Palande wrote:
>   
>> Dear All,
>>
>> The latest release does not support AMD new audio controller. The patch
>> is trying to fix it. More details can be found at:
>>
>> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=9176b672c29baaa94cdff4eedf1350a3b553d9ea
>> <http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=9176b672c29baaa94cdff4eedf1350a3b553d9ea>
>> Attached is the cherry picked code.War
>>     
>
> I am wary of this patch as it appears to come from linux-next, is this
> expected to hit Linus' tree soon?  /me footles about, actually this
> appears to be in linus tree?  Could we update the description to include
> the upstream id.
>   
Yes. This is already upstream. I have updated the patch description with
the commit id.

This patch adds a new PCI device with a AMD vendor id.
Its used for identifying any AMD sound controller.

Warm Regards,
Surbhi.

Comments

Tim Gardner Sept. 21, 2009, 9:19 p.m. UTC | #1 
Surbhi Palande wrote:
> Dear All,
> 
> 
> Andy Whitcroft wrote:
>> On Mon, Sep 21, 2009 at 11:52:46AM -0700, Surbhi Palande wrote:
>>   
>>> Dear All,
>>>
>>> The latest release does not support AMD new audio controller. The patch
>>> is trying to fix it. More details can be found at:
>>>
>>> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=9176b672c29baaa94cdff4eedf1350a3b553d9ea
>>> <http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=9176b672c29baaa94cdff4eedf1350a3b553d9ea>
>>> Attached is the cherry picked code.War
>>>     
>> I am wary of this patch as it appears to come from linux-next, is this
>> expected to hit Linus' tree soon?  /me footles about, actually this
>> appears to be in linus tree?  Could we update the description to include
>> the upstream id.
>>   
> Yes. This is already upstream. I have updated the patch description with
> the commit id.
> 
> This patch adds a new PCI device with a AMD vendor id.
> Its used for identifying any AMD sound controller.
> 
> Warm Regards,
> Surbhi.
> 
> 
> 

applied
diff mbox

Patch

From 40d9d3d4280c0c09cd74e380f0b996cc1730e8b2 Mon Sep 17 00:00:00 2001
From: Andiry Brienza <andiry.xu@amd.com>
Date: Fri, 17 Jul 2009 11:32:32 +0800
Subject: [PATCH] ALSA: hda - Add support for new AMD HD audio devices

BugLink: https://bugs.launchpad.net/bugs/430564

The commit id of this patch in the upstream kernel is:
9176b672c29baaa94cdff4eedf1350a3b553d9ea

Add support for new AMD HD audio devices. Use generic driver to detect HD audio
devices with Vendor ID AMD.

Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>
---
 sound/pci/hda/hda_intel.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 957a9ed..1c331df 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2652,11 +2652,15 @@  static struct pci_device_id azx_ids[] = {
 	/* this entry seems still valid -- i.e. without emu20kx chip */
 	{ PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_GENERIC },
 #endif
-	/* AMD Generic, PCI class code and Vendor ID for HD Audio */
+	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
 	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
 	  .class_mask = 0xffffff,
 	  .driver_data = AZX_DRIVER_GENERIC },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_ANY_ID),
+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+	  .class_mask = 0xffffff,
+	  .driver_data = AZX_DRIVER_GENERIC },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
-- 
1.6.0.4