From patchwork Wed Jun 27 11:32: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: 140322 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp745017ljj; Wed, 27 Jun 2018 04:32:52 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe+E9KXeqwiFMVikgy+ShmuRnz4ojVuW1i4shoRPb111QMeXsPSTf7sZos06UC1OBT9K3MZ X-Received: by 2002:a1c:b590:: with SMTP id e138-v6mr1707640wmf.154.1530099172092; Wed, 27 Jun 2018 04:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530099172; cv=none; d=google.com; s=arc-20160816; b=XN9zCeVQtOt26gKYuaoZI77fY7h/b+Kft8FRLOe5RwbXxGDzex/ScygQDSHvGwGqUm ZpzpcXpyJ/bBhWibM7pChbHttKq0iElKw3E+yyI4i7JemolUTVXjdLo5QnTaJ7PF2mad E/MzGF6LNpPnLTIDI2pb5+ueIPfNOTzl2G13iuzTtdPE4H/saLyJzGMGnjdYbPjDND3m Rmhxa3sIKhIeDhcn1dyItfTQB+RtwdYLdHWL0ID4gVCjaF1nVHslBhYwYjuT2LhW09xn J//s6flCVGkWFcChWN27eIZbMNFohWLNPUhRh7jgMhUM+27J+oatFGSG/WK+ahaVLFbK 47tg== 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=a0MvASkYDLxm9Ph9rEm5Vm5YI3bs2H6vA6ojIHaUJAE=; b=IfSHJ5f9L/7jDLxDlUAwAQ4RbcMrapExvpsJyPDG7/pfSCWnZfJqnQ7opPGCnwqSfY 3+NoCnJ9BkoqMx9S3HrAcFNRrxtpVXMTXR/Bq2T1h/b68x0Q2DmRYr1wlhDx3DDMqqHF sZc6yXpaE0hEKfk+06qECW0l51uV5L1TjNLp0aZkGzfbVWUdFx0U8YjVgVHE6G1+7yeC Orn/fpaDzrgX2yH0hCAor1AE7/HbTLdGzhAHnzv/pawTk7roBQ0P28lyyCT/G5EQP9IQ XZQ5LuhfsUPMqGIvJoPCPbMU1cfBl3hZZ9b2f2X4s3bgzFAy6nNjCp/3TnrZsxvSQf4E FygQ== 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="ai/iJQic"; 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 v17-v6si3464549wrd.24.2018.06.27.04.32.51; Wed, 27 Jun 2018 04:32:52 -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="ai/iJQic"; 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 BF56C26797D; Wed, 27 Jun 2018 13:32:50 +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 78AD4267987; Wed, 27 Jun 2018 13:32:48 +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=1.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_WEB, 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 CF5E5267978 for ; Wed, 27 Jun 2018 13:32:46 +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=f4PdSHqXapyZoJuKQetoNO5rFjACZuUsgVFQKe6agpI=; b=ai/iJQicXWh1 vgqq/99/cwswhwyu5DVtuGMmRSkZA1XeckTmVzztzz6b+gXuLq+0FyTBnA7YwebJyTgu+n65/6G9F z3ZJjouknQQ9bn3IEQRPLTwtrwSM5BFAshLRDhzQghINV6i591Vq4R5iO1Yf1NQjxSiKDAME4nwaI fgafo=; Received: from 188.29.164.103.threembb.co.uk ([188.29.164.103] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fY8go-0002xG-73; Wed, 27 Jun 2018 11:32:46 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 37593440070; Wed, 27 Jun 2018 12:32:45 +0100 (BST) From: Mark Brown To: Hans de Goede In-Reply-To: <20180624140634.16835-2-hdegoede@redhat.com> Message-Id: <20180627113245.37593440070@finisterre.ee.mobilebroadband> Date: Wed, 27 Jun 2018 12:32:45 +0100 (BST) 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: Add BYT_RT5651_DEFAULT_QUIRKS define" 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: Add BYT_RT5651_DEFAULT_QUIRKS define 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 fc7c460fbb4003bf3f5d2b435079c85888644663 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 24 Jun 2018 16:06:26 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Add BYT_RT5651_DEFAULT_QUIRKS define Almost all boards use the mclk and use the same jack-detect settings, add a BYT_RT5651_DEFAULT_QUIRKS define for this. This shaves of some lines and makes it easier to see which settings are unique to a certain model. Signed-off-by: Hans de Goede Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) -- 2.17.1 _______________________________________________ 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 987720e203f9..735b8312e275 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -77,6 +77,11 @@ enum { #define BYT_RT5651_SSP0_AIF1 BIT(20) #define BYT_RT5651_SSP0_AIF2 BIT(21) +#define BYT_RT5651_DEFAULT_QUIRKS (BYT_RT5651_MCLK_EN | \ + BYT_RT5651_JD1_1 | \ + BYT_RT5651_OVCD_TH_2000UA | \ + BYT_RT5651_OVCD_SF_0P75) + /* jack-detect-source + dmic-en + ovcd-th + -sf + terminating empty entry */ #define MAX_NO_PROPS 5 @@ -86,10 +91,7 @@ struct byt_rt5651_private { }; /* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on in3 */ -static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN | - BYT_RT5651_JD1_1 | - BYT_RT5651_OVCD_TH_2000UA | - BYT_RT5651_OVCD_SF_0P75 | +static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS | BYT_RT5651_IN2_HS_IN3_MAP; static void log_quirks(struct device *dev) @@ -379,10 +381,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "KIANO"), DMI_MATCH(DMI_PRODUCT_NAME, "KIANO SlimNote 14.2"), }, - .driver_data = (void *)(BYT_RT5651_MCLK_EN | - BYT_RT5651_JD1_1 | - BYT_RT5651_OVCD_TH_2000UA | - BYT_RT5651_OVCD_SF_0P75 | + .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS | BYT_RT5651_IN1_IN2_MAP), }, { @@ -392,10 +391,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"), DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"), }, - .driver_data = (void *)(BYT_RT5651_MCLK_EN | - BYT_RT5651_JD1_1 | - BYT_RT5651_OVCD_TH_2000UA | - BYT_RT5651_OVCD_SF_0P75 | + .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS | BYT_RT5651_IN2_HS_IN3_MAP), }, { @@ -405,10 +401,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "VIOS"), DMI_MATCH(DMI_PRODUCT_NAME, "LTH17"), }, - .driver_data = (void *)(BYT_RT5651_MCLK_EN | - BYT_RT5651_JD1_1 | - BYT_RT5651_OVCD_TH_2000UA | - BYT_RT5651_OVCD_SF_1P0 | + .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS | BYT_RT5651_IN1_IN2_MAP), }, {}