From patchwork Wed Mar 7 14:22:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130914 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5242344lja; Wed, 7 Mar 2018 06:23:09 -0800 (PST) X-Google-Smtp-Source: AG47ELt+3TPZjGl2/xVCe1XnTz8ipcQLVfomFTawltma29NcDSKXYTWVbpG90Ju2UNUrb/AECtKM X-Received: by 10.223.158.69 with SMTP id v5mr19567510wre.142.1520432589911; Wed, 07 Mar 2018 06:23:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520432589; cv=none; d=google.com; s=arc-20160816; b=WcPNzd0JbHdZfu/3EQIEmy4EhFYaFbqCs8zkcaoUKhebjAn1pE0wAgop8MriCQYvlu XOwD+0LCxhn9bvruR3MLyb4BJJfz3Vbe6UXchvc6CtAn7tvQa886mQmGfCkKZeAbY+Mz f1kVp50SaD8Oh9m/Zp/rVSDs5vNRHz0d2mGPmUI/f0p1aLE8qjVOj7HwqwN/k8X56k16 TAETdIj41ddMM46k1aQCySjfUTkPEU9oEDsrHmW3ankaQAE9JiRdL7decasQwl84i4ST S/nPB6z02tU7eP1Fn7W5BDFUFXysg3zniB6aDGBHwnJ1A3CpQ9jVHqb6X+LaefwcfmHX nDgA== 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=OTEE25arcMqL5vFeTsREwgDfLNS5f3bHOCcqI8xRumg=; b=z5KlaFljBnUPJC6PeZ4wJ17JDm1HtM885mle5WOp5ZXoOYFLYadOMitZInq7WZDNXV eZ59cEFV9Gc6sFuKHDnUIXR5TAL3EQFWwwLTebI2KoRDjLTZtvu9/jMVM4sjvC7GpmSB xR4j0RHXI532z1wQ95aoUaggIqApVCpYxrJtvKVMgJwfzVzLg2DsvyJ6cdI7uwde1j6X fmKwtcSfMw0486nFGc3DH6LCAMuKAY0wv7HeoUu9KL3SK4IGH9kvxvnakJZb0ni+a1yF olwdbG/CE5btPVyBWDW/cUwKSq6O/JBOGWAQJIuEBKqRAwyYZthVckaBb0pb/IT8fdLo 3bbg== 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=LyUK6Jjv; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id a6si3236430wme.99.2018.03.07.06.23.09; Wed, 07 Mar 2018 06:23:09 -0800 (PST) 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=LyUK6Jjv; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 869082673F2; Wed, 7 Mar 2018 15:22:50 +0100 (CET) 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 C106D267475; Wed, 7 Mar 2018 15:22:47 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 1AF6D2673A4 for ; Wed, 7 Mar 2018 15:22:43 +0100 (CET) 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=CKkXfGG7Pd2uuGgulhBdnDmFabmccLDH3tZmZLD8RW8=; b=LyUK6Jjvy4CV vnofpgIq7JzgcF91oteAm7RuyFEuUMQHsPpvAvPEWQ1a8Wcadguwr8k1hr3SjCpL4Nm1SKc2xajeV T5ePRk7uC2BpegQiwvbuH1Ix04EJr1Y1pajarBWNUf82HRkb+tWGchwYvrsQwRbzWzM4QM4KRuxuh WjYr8=; 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 1etZxm-0000EN-BT; Wed, 07 Mar 2018 14:22:38 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1etZxl-0002qr-T2; Wed, 07 Mar 2018 14:22:37 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180304143610.21125-13-hdegoede@redhat.com> Message-Id: Date: Wed, 07 Mar 2018 14:22:37 +0000 Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Takashi Iwai , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: Intel: bytcr_rt5651: Actually honor the DMIC_EN quirk if specified" 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: Actually honor the DMIC_EN quirk if specified 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 c2f26938d2a456dcf429385617e58cfd510a64a8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 4 Mar 2018 15:36:00 +0100 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Actually honor the DMIC_EN quirk if specified Before this commit it was possible to set the DMIC_EN quirk in the machine driver, but it would never be passed to the codec driver so it was a nop. This commit adds code to actually pass the quirk to the codec driver. Since the DMIC_EN quirk was ignored before, this commit removes it from the default quirk settings, to avoid this causing an unexpected functional change. If we really want the DMIC_EN behavior anywhere it should be specifically enabled by follow up commits. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.16.2 _______________________________________________ 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 499e405e591b..a874bba3aec0 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -57,8 +57,8 @@ enum { #define BYT_RT5651_MCLK_EN BIT(17) #define BYT_RT5651_MCLK_25MHZ BIT(18) -/* jack-detect-source + terminating empty entry */ -#define MAX_NO_PROPS 2 +/* jack-detect-source + dmic-en + terminating empty entry */ +#define MAX_NO_PROPS 3 struct byt_rt5651_private { struct clk *mclk; @@ -66,7 +66,6 @@ struct byt_rt5651_private { }; static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP | - BYT_RT5651_DMIC_EN | BYT_RT5651_MCLK_EN; static void log_quirks(struct device *dev) @@ -327,6 +326,9 @@ static int byt_rt5651_add_codec_device_props(const char *i2c_dev_name) props[cnt++] = PROPERTY_ENTRY_U32("realtek,jack-detect-source", BYT_RT5651_JDSRC(byt_rt5651_quirk)); + if (byt_rt5651_quirk & BYT_RT5651_DMIC_EN) + props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,dmic-en"); + ret = device_add_properties(i2c_dev, props); put_device(i2c_dev);