Received: by 10.223.185.116 with SMTP id b49csp1101094wrg; Sat, 3 Mar 2018 15:34:59 -0800 (PST) X-Google-Smtp-Source: AG47ELsWMPjVDdoAczF7p0dTGhWyCNJ/45303PqAFr6Uu2n/RSjS0UKpK76eO/XeaaV+XtUHnGt0 X-Received: by 2002:a17:902:6083:: with SMTP id s3-v6mr8739671plj.6.1520120099352; Sat, 03 Mar 2018 15:34:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520120099; cv=none; d=google.com; s=arc-20160816; b=ocreNOo8vFFt1Bk3FZfF60Wx1Ug5dym6XdU931RoaXHfRPUzgGsfadBJUrtimMsJAI yok7dI/tr5xPfGGaOFliViMOLofHhe8uRYFd25LbldoRmaOw1HGCqDiLdBpAcY9XrHVx iMoARZejvKqcd4X3NWIQJfwY+0rZ/toIz4t6iZugftRYhITWChD8bLF20/VGND9KLHuL UZNqUh1ozect+AWlJCs+quogIt5n6AGF8a3XL7nrNIV5Vv9Xpc//TOPSNTr6MPKPce+0 Yv6Z4RNu9bDw55g+H37CvikD6Iz74AApeQxYujrVUiPtsp9wqDbpGqGH0c4dCnv5fX2t +pwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=qhLSqG9OEn2hlcYAY4U9J9zSCup3uSmeqfa+D2aW22Q=; b=BPIsmEYHwbvDpYJWh2QsG2fHMwY9mcFKokqoXy/GRFtg79kito+DL3PF3X/pTyM1lW AywfC3CSfGCJsAuRCbdOnQ1FSZIC45qnrBFEQB86oNmgtJIiRZN0ZWgLHVyWn2VpgjsX Q96wuJP/+xD3WVc2hoiYfufAozWzqkfRmjtL7ZqgVic6UNx1ds4vwYIXyHfVkgEhnBZv D/+4ZhsK+aQed1FmdgbWUeeKWtF8woM/ax1E8/uq9LY19i13TXG9ICfIjrOAP/Php0Zw 7TvqhaMobDa7krWEZs9d5v8lhwc5Pdwc7r6sXBzIUu15rB+nTny/mqX8q0JyZ3ocyrca qqGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=KinyJGPT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x13si6117195pgc.75.2018.03.03.15.34.45; Sat, 03 Mar 2018 15:34:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=KinyJGPT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934481AbeCCWgA (ORCPT + 99 others); Sat, 3 Mar 2018 17:36:00 -0500 Received: from mail-bn3nam01on0133.outbound.protection.outlook.com ([104.47.33.133]:8222 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934432AbeCCWfx (ORCPT ); Sat, 3 Mar 2018 17:35:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=qhLSqG9OEn2hlcYAY4U9J9zSCup3uSmeqfa+D2aW22Q=; b=KinyJGPTK6EtuIU/aHC2QGR7U8MVSJ5dOdwTYavat6AADkV52Oz85Ni6XrLmQwlA2ZqwndDeef9Gn3RVLiOBcesLR5rGwOPOzPnjvS69dcSlMOowjmtbbbEdvKCjZp6poy1tt+rHlvBG6NZRG0yXDAx7l6EPPGkPqjqeE/TFzik= Received: from MW2PR2101MB1034.namprd21.prod.outlook.com (52.132.149.10) by MW2PR2101MB1034.namprd21.prod.outlook.com (52.132.149.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Sat, 3 Mar 2018 22:35:44 +0000 Received: from MW2PR2101MB1034.namprd21.prod.outlook.com ([fe80::1d56:338f:e2b:cec0]) by MW2PR2101MB1034.namprd21.prod.outlook.com ([fe80::1d56:338f:e2b:cec0%3]) with mapi id 15.20.0567.006; Sat, 3 Mar 2018 22:35:44 +0000 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 158/219] ALSA: hda: Add Geminilake id to SKL_PLUS Thread-Topic: [PATCH AUTOSEL for 4.9 158/219] ALSA: hda: Add Geminilake id to SKL_PLUS Thread-Index: AQHTsz8Xcy8T914IkE+zekQYQPzprQ== Date: Sat, 3 Mar 2018 22:29:28 +0000 Message-ID: <20180303222716.26640-158-alexander.levin@microsoft.com> References: <20180303222716.26640-1-alexander.levin@microsoft.com> In-Reply-To: <20180303222716.26640-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;7:LkFz5vSlFqxMHTJZo78vuPCTX56FE3dW+QIieOtCCbYYq7zYVZZYEUFQIWCdO8RUGD7q6ZUBLI2plSGnkEypR+9fZSiuRmGSGtLxu3BmMRB1rZtmSVz2F69JEHzI9yHwDm12vm0jDkQL/fQ252aYy+p9NY5jDiSETOdgasKtqZuoUb+Wlc7tqDhXqbTwER56mB/x2ZBBE8Hb/6UQIDuevPU3DBMAz2Na8LgKS9gB89TQ+XTGaMHRFYCe/+6YxY3o x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9c603922-6fa1-4124-35d8-08d5815719f1 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(346002)(39860400002)(39380400002)(366004)(396003)(199004)(189003)(99286004)(22452003)(72206003)(316002)(3846002)(6116002)(186003)(26005)(478600001)(76176011)(54906003)(110136005)(102836004)(97736004)(1076002)(2501003)(3660700001)(66066001)(5250100002)(5660300001)(86362001)(10090500001)(10290500003)(86612001)(6506007)(68736007)(575784001)(106356001)(25786009)(8676002)(4326008)(59450400001)(6512007)(305945005)(2906002)(14454004)(107886003)(8936002)(7736002)(81166006)(3280700002)(53936002)(105586002)(81156014)(6666003)(6486002)(36756003)(2900100001)(6436002)(2950100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: VjWFEzF+hUzRZEBXcFDz5eGdYN6muLa+j2neWLSn1xF3pNlD8qLmY0W0sd8pbg3EKGR363LvdwpNfB0cpbrHSsB+j/f4DP2mF3AbBps2bzqaeyW7L+4u0HH2D49TyppETCUhv6IAsCQ6KMi2jAHD6ixzNPQLb6Oyowb7gMCY47s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c603922-6fa1-4124-35d8-08d5815719f1 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:28.7132 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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