From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC80EC004C9 for ; Tue, 7 May 2019 21:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB8B5206A3 for ; Tue, 7 May 2019 21:54:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="V6xCCkTO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728459AbfEGVy2 (ORCPT ); Tue, 7 May 2019 17:54:28 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39165 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727005AbfEGVy1 (ORCPT ); Tue, 7 May 2019 17:54:27 -0400 Received: by mail-pf1-f195.google.com with SMTP id z26so9341424pfg.6 for ; Tue, 07 May 2019 14:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wo1uH0ylotnTiIgpcBv8Fglh9i6GTYOrB2xHSboADtc=; b=V6xCCkTO4jlGJ++M+dImXdNgyseWeYSP2BtuT9N/KmOmPgYyBmVoAbvY1QY7X+ZFoj JVk/Fk+71VCwkxbV725166sVXHwLpEkjueMJvXww0vne0TyP5/Vm3ClpvxGC6vgJSVdv 2PiDF2XOwi22Ri3v3e+yG9nA1rv9yYAWfkMd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wo1uH0ylotnTiIgpcBv8Fglh9i6GTYOrB2xHSboADtc=; b=b44DTCIBnVxxETaFoPsy5sqeRKG1Pctifyj1mSm9+nXklb9iC5a5NriAsg/YMkhp9+ ctbiFSQAzgG/xVI4+4J5FLKpbELC58yWViIA/iEf/S647/L52ugxt7NwY3dEY2Rh70/8 KnakOgatVYUW1DSD+uavM08/QcFRQbNMECq4+6Rb8WhUrmx/pTC9SrYNhGoceL7Fsmcy GORjW2bUBAXq7svQGI71oO5lGho57melYBXxMg2Pk5jAtcsOrYNBgcp6QSiTZoQpHk/x AMGVrq39fYzOWEOLTb6+ZU+CzktgDt6ryOklR03vffeJk9i7nLmwXpqABvYgQuKoZ+B8 iYaw== X-Gm-Message-State: APjAAAVl2A4qAGOTq1Aey/CMrsG0o2ozTB6A8csnJaHjSwqdH2UVv410 WHTI5F8Dxls4Pl7ZWjyr5gjiKQ== X-Google-Smtp-Source: APXvYqzEdUL4jjUuQFEi6eH10frUgDtP+jcneWRtKHVq/LVemZMy4gGAgflPJLxLdN2o2wjiZeu/4w== X-Received: by 2002:a62:6f02:: with SMTP id k2mr45236465pfc.136.1557266066711; Tue, 07 May 2019 14:54:26 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id 19sm36854191pfs.104.2019.05.07.14.54.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 May 2019 14:54:26 -0700 (PDT) From: Evan Green To: Liam Girdwood , Mark Brown Cc: Pierre-Louis Bossart , Naveen M , Sathya Prakash , Ben Zhang , Rajat Jain , Evan Green , Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood Subject: [PATCH v2 1/2] ASoC: SOF: Add Comet Lake PCI IDs Date: Tue, 7 May 2019 14:53:58 -0700 Message-Id: <20190507215359.113378-2-evgreen@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507215359.113378-1-evgreen@chromium.org> References: <20190507215359.113378-1-evgreen@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for Intel Comet Lake platforms by adding a new Kconfig for CometLake and the appropriate PCI IDs. Signed-off-by: Evan Green --- Changes in v2: - Add CML-H ID 0x06c8 (Pierre-Louis) sound/soc/sof/intel/Kconfig | 32 ++++++++++++++++++++++++++++++++ sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 2 files changed, 40 insertions(+) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 32ee0fabab92..b3f4463100ce 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -24,6 +24,8 @@ config SND_SOC_SOF_INTEL_PCI select SND_SOC_SOF_CANNONLAKE if SND_SOC_SOF_CANNONLAKE_SUPPORT select SND_SOC_SOF_COFFEELAKE if SND_SOC_SOF_COFFEELAKE_SUPPORT select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT + select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT + select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT help This option is not user-selectable but automagically handled by 'select' statements at a higher level @@ -179,6 +181,36 @@ config SND_SOC_SOF_ICELAKE This option is not user-selectable but automagically handled by 'select' statements at a higher level +config SND_SOC_SOF_COMETLAKE_LP + tristate + select SND_SOC_SOF_CANNONLAKE + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_LP_SUPPORT + bool "SOF support for CometLake-LP" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-LP processors. + Say Y if you have such a device. + If unsure select "N". + +config SND_SOC_SOF_COMETLAKE_H + tristate + select SND_SOC_SOF_CANNONLAKE + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_H_SUPPORT + bool "SOF support for CometLake-H" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-H processors. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_SOF_HDA_COMMON tristate select SND_SOC_SOF_INTEL_COMMON diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index b778dffb2d25..f559a56d18ab 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -353,6 +353,14 @@ static const struct pci_device_id sof_pci_ids[] = { #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) { PCI_DEVICE(0x8086, 0x34C8), .driver_data = (unsigned long)&icl_desc}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) + { PCI_DEVICE(0x8086, 0x02c8), + .driver_data = (unsigned long)&cnl_desc}, +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) + { PCI_DEVICE(0x8086, 0x06c8), + .driver_data = (unsigned long)&cnl_desc}, #endif { 0, } }; -- 2.20.1