Received: by 10.213.65.68 with SMTP id h4csp37720imn; Mon, 19 Mar 2018 18:46:25 -0700 (PDT) X-Google-Smtp-Source: AG47ELuIsvpQHl4SCDunY7GQqnuDo6EhUVa3E/knim5B53jtKsLLcKl+YNwRpZ9EkxbKI4/rt+Yg X-Received: by 10.98.227.16 with SMTP id g16mr3873674pfh.171.1521510385481; Mon, 19 Mar 2018 18:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521510385; cv=none; d=google.com; s=arc-20160816; b=vUXyhNGY2wtYS16KmXIwjddcEVCFYzpRg7M1rPCNRbcYtwzw7Rh92ADQfDb7hd/esK RuhcFwf6aAyQ+JLD9kDtYn08eZerWMg0G29pupvKUasD5wNdudZ5g9akfw9WLo/unQrv 9zVy5l1hIZD6FaGO4smBXGHXSV7mT8v1j0Na0iKUxzYni8QfccNlFyJ8FtGCnf3SeIRi tYPycxFHyntWU3zLlxRyZ0R5w5UiC1Rbc4BkAALGm2pc9eesfK82guUI3SjgecNc95BD 2LNCi1sxDwMtY7+ZtTZJ/bYaU3M8Kzk/Sx/rf+BOS9NDJFQooxQwropaM4IJnjtN9x4M LIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=8Ow/VO5JDVz16uZX4rvzqz6VmEpPj+og87ZGJ+aNJS0=; b=YfiUpijICghgxzy7pEdMpP7GE4YC4oZof4Qaa88z0PnpMP3ej3z3MjXU14y5EvQ1Bu joYVD/mO1daTjxljD1xiPCSHXE79L0jI1p3eGcOOG9NnCI7t6Z/WVaChRmgpN/FBnXl3 9KPjSKXxeF8O4J3gqwx8Oa6pZus/Pj3cNZK5z5XXmptbZyLiacEh5khkmnMZoHPmzDmw g3rUqkAxwmPzIVUXKHuvmcokEDmU9uj+5mMCEdKdFeqYyqw/1GSVkp9vOLEy7iK3AjTS l7vpBQobJQJ628bejvwxe+sKl6PEV0JXLGQRW2EOZ9qNe+1LYSwFpt3OUkHxMAkS/yLF fTbg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l69si438803pfk.180.2018.03.19.18.46.11; Mon, 19 Mar 2018 18:46:25 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967708AbeCSTY2 (ORCPT + 99 others); Mon, 19 Mar 2018 15:24:28 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50016 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031133AbeCSSYj (ORCPT ); Mon, 19 Mar 2018 14:24:39 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 7A9A4E72; Mon, 19 Mar 2018 18:24:38 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Subhransu S. Prusty" , Senthilnathan Veppur , Vinod Koul , Takashi Iwai , Sasha Levin Subject: [PATCH 4.9 151/241] ALSA: hda: Add Geminilake id to SKL_PLUS Date: Mon, 19 Mar 2018 19:06:56 +0100 Message-Id: <20180319180757.434053664@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/hda_intel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- 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 == 0x8086 && (pci)->device == 0x9d71) #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_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) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel",