Return-Path: From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: "Subhransu S. Prusty" , Senthilnathan Veppur , Vinod Koul , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 012/190] ALSA: hda: Add Geminilake id to SKL_PLUS Date: Thu, 8 Mar 2018 04:58:54 +0000 Message-ID: <20180308045810.8041-12-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: From: "Subhransu S. Prusty" [ Upstream commit 12ee4022f67f8854061b46e5c0a7ad6258ab66c2 ] Geminilake is Skylake family platform. So add it's id to skl_plus check. Fixes: 126cfa2f5e15 ("ALSA: hda: Add Geminilake HDMI codec ID") Signed-off-by: Subhransu S. Prusty Cc: Senthilnathan Veppur Cc: Vinod Koul Cc: Takashi Iwai Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/hda_intel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 293f3f213776..c9b2dff38c3c 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -369,8 +369,10 @@ enum { #define IS_KBL_LP(pci) ((pci)->vendor =3D=3D 0x8086 && (pci)->device =3D= =3D 0x9d71) #define IS_KBL_H(pci) ((pci)->vendor =3D=3D 0x8086 && (pci)->device =3D=3D= 0xa2f0) #define IS_BXT(pci) ((pci)->vendor =3D=3D 0x8086 && (pci)->device =3D=3D 0= x5a98) +#define IS_GLK(pci) ((pci)->vendor =3D=3D 0x8086 && (pci)->device =3D=3D 0= x3198) #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_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci) || \ + IS_GLK(pci) =20 static char *driver_short_names[] =3D { [AZX_DRIVER_ICH] =3D "HDA Intel", --=20 2.14.1