From patchwork Tue Jul 10 18:16:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141645 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4203140ljj; Tue, 10 Jul 2018 11:17:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd275M5astxWNowehqkOsB1AFg4N2Jy0SGbQJSQC/IluTXVoj3TZHGMCIbWg1wNpl1QhXXr X-Received: by 2002:a1c:3351:: with SMTP id z78-v6mr14891053wmz.23.1531246667946; Tue, 10 Jul 2018 11:17:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531246667; cv=none; d=google.com; s=arc-20160816; b=GCUq1C4fiSAovGBOTaCz0fYoXiVvOVyub1miKb234oBQ749C4f2qE9PQRzkrnIUBNz gW2pv7uZX07tW/hMiqfPZ0lsDFENB4owc/JxIhpRCDCVw3Mq41SSslm8+R2VQlI/erH9 3fR/vdhXptTJcJPKYk1SqM+kFOPm4I87/wS+BeooFCHKas7avJC8SHq9axRrNeCfvKoM e5mM44EFWtPqsGlxG+Lj5L+FlVcklkFBzCKadDmuvNQiMEzfynbiSuw3gpozHw+FyEEk wP7SW42WSPo/VXivEfXtjTkyeoSL2st/u/9W+dth9R72rdFYOKuDHJkB4Ad+CEaLl45J +OLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=uqi7yRPjOqV9ZowIJiUAdZh+//WdsiD3uXYMjKZBKoU=; b=iVsom9lliSnrsFg4TJtBDcs7p6B+VtL0G+1H4zX4MrL1L2790l0aY9XyUT6stLEfL7 VERmdRt4DVZCUDicyR+JfVbiaEuSbX+2cvgElIdAWsoq+asZOlSezjXhJW+BrdigAJ39 WIlhYlzNd1AY8130wiHtAepswhOPol+LMYeXOVQaTRc0eNVwgBAeSqoojtTXTP5CCiVD 1d8KKiTmrj7Gugjho8CfXg0eIKoxXrHPBd6qLEy9Jg4qFCIk+dqZpnxTlylDk/FW8adx URjHXTYekuLPfUnP+b/YrHHruaD/vhPlksyW5/PTd9fGE3pHBhjqTW8CyjtaT7tJaUZE gQ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GrjvJoFT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id h199-v6si16wmd.12.2018.07.10.11.17.47; Tue, 10 Jul 2018 11:17:47 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GrjvJoFT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 87B4D26775E; Tue, 10 Jul 2018 20:17:01 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 896CB267720; Tue, 10 Jul 2018 20:16:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 06C10267720 for ; Tue, 10 Jul 2018 20:16:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=dLLc3RfvVeGz2m3CgSSx3fQ49SLtECvfDQ+OdMdzDcg=; b=GrjvJoFTrSj5 idqCcE74f05DfFgvYC4MReg8szfe1mgBrGUCHm7jOUz4wYtTSg3FxgmYWP6xyaM7pvEkS9jIUBBEo s6fAIDG0WkzCQX4RAcfQZGi50duXaaoU2ukkQlfOpyBISCcLHIcD5ndOXYng6WA4HiwbCkCc5JEbj EAL+o=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fcxBt-00029r-TL; Tue, 10 Jul 2018 18:16:45 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fcxBt-0001mY-Ex; Tue, 10 Jul 2018 19:16:45 +0100 From: Mark Brown To: Hans de Goede In-Reply-To: <20180701183631.5532-1-hdegoede@redhat.com> Message-Id: Date: Tue, 10 Jul 2018 19:16:45 +0100 Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: Intel: bytcr_rt5651: Remove is_valleyview helper" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: bytcr_rt5651: Remove is_valleyview helper has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From fbea16dbc0a31484811c5f335ae344b2bbc66f40 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 1 Jul 2018 20:36:29 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Remove is_valleyview helper Remove is_valleyview helper, this is not necessary, we can simply call x86_match_cpu() directly instead. Signed-off-by: Hans de Goede Acked-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index ba2753e0e12a..80f47a45cb10 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -680,17 +681,10 @@ static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-mic[-swapped-hp]" */ -static bool is_valleyview(void) -{ - static const struct x86_cpu_id cpu_ids[] = { - { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ - {} - }; - - if (!x86_match_cpu(cpu_ids)) - return false; - return true; -} +static const struct x86_cpu_id baytrail_cpu_ids[] = { + { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 }, /* Valleyview */ + {} +}; struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ u64 aif_value; /* 1: AIF1, 2: AIF2 */ @@ -741,7 +735,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) * swap SSP0 if bytcr is detected * (will be overridden if DMI quirk is detected) */ - if (is_valleyview()) { + if (x86_match_cpu(baytrail_cpu_ids)) { struct sst_platform_info *p_info = mach->pdata; const struct sst_res_info *res_info = p_info->res_info;