Message ID | 1497414116-22733-1-git-send-email-subhransu.s.prusty@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jun 14, 2017 at 09:51:56AM +0530, Subhransu S. Prusty wrote: > From: Megha Dey <megha.dey@intel.com> > > Coffelake is another Intel part, so need to add PCI ID for it. > > Signed-off-by: Megha Dey <megha.dey@intel.com> > Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Acked-By: Vinod Koul <vinod.koul@intel.com> > --- > sound/pci/hda/hda_intel.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 1770f085c2a6..e3c696c46a21 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -371,9 +371,10 @@ enum { > #define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0) > #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) > #define IS_GLK(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x3198) > +#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) > #define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \ > IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci) || \ > - IS_GLK(pci) > + IS_GLK(pci) || IS_CFL(pci) Takashi, given the pattern here that device are SKL derivatives, this would blow up, can we do something here please. I am thinking using AXZ_DCAPS foo rather than IS_foo() > > static char *driver_short_names[] = { > [AZX_DRIVER_ICH] = "HDA Intel", > @@ -2378,6 +2379,9 @@ static void azx_shutdown(struct pci_dev *pci) > /* Kabylake-H */ > { PCI_DEVICE(0x8086, 0xa2f0), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, > + /* Coffelake */ > + { PCI_DEVICE(0x8086, 0xa348), > + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE}, > /* Broxton-P(Apollolake) */ > { PCI_DEVICE(0x8086, 0x5a98), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON }, > -- > 1.9.1 >
On Wed, 14 Jun 2017 06:21:56 +0200, Subhransu S. Prusty wrote: > > From: Megha Dey <megha.dey@intel.com> > > Coffelake is another Intel part, so need to add PCI ID for it. > > Signed-off-by: Megha Dey <megha.dey@intel.com> > Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Applied, thanks. Takashi
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1770f085c2a6..e3c696c46a21 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -371,9 +371,10 @@ enum { #define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0) #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) #define IS_GLK(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x3198) +#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) #define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \ IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci) || \ - IS_GLK(pci) + IS_GLK(pci) || IS_CFL(pci) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", @@ -2378,6 +2379,9 @@ static void azx_shutdown(struct pci_dev *pci) /* Kabylake-H */ { PCI_DEVICE(0x8086, 0xa2f0), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, + /* Coffelake */ + { PCI_DEVICE(0x8086, 0xa348), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE}, /* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },