From patchwork Wed Mar 7 14:21:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130905 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5241215lja; Wed, 7 Mar 2018 06:22:00 -0800 (PST) X-Google-Smtp-Source: AG47ELsucDToqfZwaietQOeDjuGz7fIXiQm60Zc08mUwW8LkEj66fAeP0Z5E0WW/70nzAQOk20rk X-Received: by 10.28.160.9 with SMTP id j9mr6712186wme.103.1520432520693; Wed, 07 Mar 2018 06:22:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520432520; cv=none; d=google.com; s=arc-20160816; b=BPuLyJPku/BPv1qiZf4bpQzmkPMBopAdLqLbOrgE4PCsD2Kh0qNTNdppWzUfW2vzV1 bAwYY8oznANUHMI+jxRUoLNFOif0dhjT/96z1SK7EMKeaiwdwC/WyCJDh+gi5N3ioBT0 0zOluWN198cRyOz+cdwEdeWSDyXkijL6Ivb5bv+rhqJX3vp7eaJ3A5DdG2WTNGVG18ZG MbhZH7jM2ObviDguY7NKD56ImK0EMOOq9T6son1nML1mVvL6WvvPk+oppGTdwI2MQqry jBogxrS9HMKfGjLekc/ynRXFT3sC56nOCPiAxxiuNgoPCdD+t9XHNHAJhHIPC1AYiqXw NQCQ== 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=9uWiYZpA2HKodNd/5G8NxjUBTMyXVSXsI9yAiOGIt4c=; b=FiGGePF0iQMOMTFCy+t1qi3SvvelIzEVT9reEgO7YRab+RXWYiAObRXwXhqoyhlcjw 64TJF0EnqCd6k2Yfje+sAjRgYZkNOxAxM4G2flY66HR5RbrCYY9sco7hYL2N7n4YlXbB tuivAa35WlXss377bTEmH4jJSnWVGGzL/jfwwiiPBYbgQMMs290iDeraVA0f74VnBZZB NEtEyzNZt0KWEwP058ef0hBN6kocGljuy6m18B3JS0JreFUU5JDkBhmDvkTL1v9wMRX8 b4hLZr7w9ZbRmCGWvVW5VWp10spflUgfR/65RW/T5py5Ov0VB0bumIZTu+R9A27fLfhh TCRA== 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=owpKUnlP; 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 a186si8037164wmf.50.2018.03.07.06.22.00; Wed, 07 Mar 2018 06:22:00 -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=owpKUnlP; 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 B2BD02673A2; Wed, 7 Mar 2018 15:21:58 +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 5EAE72673A2; Wed, 7 Mar 2018 15:21:56 +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 6960A267048 for ; Wed, 7 Mar 2018 15:21:54 +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=qsNrXdso3mkzSGcsKdWsgXYZ+OAAvZRyaAr3wLJqve0=; b=owpKUnlPNmWu 8iXOphj1BZZ2I15qkWISqs30I8djrEIU2bGmQN6I3BnlDKAWhTEq19Ge3U17VmWmfeJpTOTJxJPjY j5nSKyFoML/5ASiCeiq/+zWks2iDtLqBR+jMCITbXUhABi6Os7Bimll2gtdwGeAKNuciH/eylSwcy fi6ac=; 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 1etZwz-0000Ct-BO; Wed, 07 Mar 2018 14:21:49 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1etZwy-0002gW-TM; Wed, 07 Mar 2018 14:21:48 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-32-hdegoede@redhat.com> Message-Id: Date: Wed, 07 Mar 2018 14:21:48 +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: Change defaults to enable jack-detect, analog mics" 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: Change defaults to enable jack-detect, analog mics 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 b4b6377e07727df8292539062d9a56e6bd83ba89 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 4 Mar 2018 15:36:09 +0100 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Change defaults to enable jack-detect, analog mics Change the default quirk settings to enable jack-detect, analog mics. The old default input mapping of DMIC for non Bay Trail CR devices seems like a poor default as I'm not aware of any Intel SST + rt5651 using devices with a DMIC. All Cherry Trail devices using the bytcr_rt5651 machine driver seem to be modelled after BYT-CR devices, And the only non CR Bay Trail devices with a rt5651 codec I'm aware of are the Minnow boards for which we already have board specific quirks. So it seems better to me to use the BYT-CR defaults everywhere. This e.g. makes the Chuwi Hi8 Pro (CWI513) work ootb without needing a quirk. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 d5a3d48294d2..6efd7c9e7407 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -85,7 +85,12 @@ struct byt_rt5651_private { struct snd_soc_jack jack; }; -static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN; +/* 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 | + BYT_RT5651_IN2_HS_IN3_MAP; static void log_quirks(struct device *dev) { @@ -809,14 +814,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) /* no BIOS indications, assume SSP0-AIF2 connection */ byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2; } - - /* change defaults for Baytrail-CR capture */ - byt_rt5651_quirk |= BYT_RT5651_JD1_1 | - BYT_RT5651_OVCD_TH_2000UA | - BYT_RT5651_OVCD_SF_0P75 | - BYT_RT5651_IN2_HS_IN3_MAP; - } else { - byt_rt5651_quirk |= BYT_RT5651_DMIC_MAP; } /* check quirks before creating card */