From patchwork Tue Jul 10 18:16:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141638 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4202236ljj; Tue, 10 Jul 2018 11:16:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeUjTCj5PAh0CglqTrWo7EaHRBN27cbpa73vcsEVX5qM60Qhq/dIOPIbbCqKzmKU6rXZu5N X-Received: by 2002:adf:ec04:: with SMTP id x4-v6mr7766267wrn.245.1531246613318; Tue, 10 Jul 2018 11:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531246613; cv=none; d=google.com; s=arc-20160816; b=Pe1Cfoe9Xl2AZOvaGvaHWU3p1FQWFFotDDKms+AF34dSRAd8GQTJgsIGRyLArFuqMW rY9eJzKeYRcesLWR01RckKO7eYdnY3DhXkhjbVNtOlzkBDT4VByX7XHVuJy2PyNhAG1b UKh2418+KrmY1DON1ZyJZRX9DQrTuf78Wnb3qbs+oAbb2jaVX95djWkOB6M1dtzF6YGU 1ZANQdXcmwqMgk5iNofOodWW2IObUMej/typE9odLs4YcORq1uL3F55nsY45ORqDNizk 7XShT5bnfxJL/s6VBYRl4tNDNREkSYUU2sDosn15TQll0xp8zUfhj+XiT8bxGkUeDeNz iekg== 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=cRnBqB61u55jvBMAqJi0Js/dDNkJaJNLGID8fXEY4J4=; b=vMJJPptFsZR5Y/35zCulTy+qAvpyHzUNNciv6iZEierGA9Ywfq+hxAYqu2fJ75OAiy 0+ivdLWTSKTTAsIg3TZU+8bpRnqQ04n3Lpk0aCiquhktffyLJX1Jk9FBz8TuTIGMhFL9 yEj7GvM5iXQBMxiP20KuCBT8Z9rDGGjLLf6rsHbI9fXxfqPmAYaNQJmxlxMh+K0SPhUd LqyKdStdK+d0V99kSfm5OhEepo9MpMxbPdFaTodC+xfi65OHXoHCaguj1HB8x0mEs+xm my9IYNIilZkmVo5ug/RsBbV6Uab4njjUX3C6gYHnUOsH/pZhpbz1rTWnPZGcnVs1X7Ec zqqg== 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=Rnt6j+1D; 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 v7-v6si10661548wre.88.2018.07.10.11.16.53; Tue, 10 Jul 2018 11:16:53 -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=Rnt6j+1D; 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 772D2267718; Tue, 10 Jul 2018 20:16:48 +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 5FEE026771A; Tue, 10 Jul 2018 20:16:46 +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 653CD267713 for ; Tue, 10 Jul 2018 20:16:42 +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=89ALG1482Ka7lDC9yTnOxxDaaYcyM6+LnMS1ayjE4LE=; b=Rnt6j+1D92Au EXhZQ8p/oDVJn0nfacz1OaMpZoblhMZOZUhOBasuCjHBbdkrsGwjynWsos+4FD49WqA/te/47plBM 64YVBtGv2NCHtU/G9FVPFIv5DMxP7Ypby7/9KNccMS//d2smkwh0Wm/4jav8BNNOTEPngAYK8I2ha uFsxQ=; 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 1fcxBg-00028y-Iv; Tue, 10 Jul 2018 18:16:32 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fcxBg-0001gI-4m; Tue, 10 Jul 2018 19:16:32 +0100 From: Mark Brown To: Hans de Goede In-Reply-To: <20180704225935.7902-4-hdegoede@redhat.com> Message-Id: Date: Tue, 10 Jul 2018 19:16:32 +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: Disable jack-detect over suspend/resume" 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: Disable jack-detect over suspend/resume 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 b91f432cbc3326f715b8c3f02ff4066ab398833f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 5 Jul 2018 00:59:34 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Disable jack-detect over suspend/resume Disable jack-detection and thus the codec IRQ over suspend/resume. Signed-off-by: Hans de Goede Acked-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 49 ++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 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 5301205496be..2a8f86dfe4cb 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -676,6 +676,48 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { }; /* SoC card */ +static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; +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 int byt_rt5651_suspend(struct snd_soc_card *card) +{ + struct snd_soc_component *component; + + if (!BYT_RT5651_JDSRC(byt_rt5651_quirk)) + return 0; + + list_for_each_entry(component, &card->component_dev_list, card_list) { + if (!strcmp(component->name, byt_rt5651_codec_name)) { + dev_dbg(component->dev, "disabling jack detect before suspend\n"); + snd_soc_component_set_jack(component, NULL, NULL); + break; + } + } + + return 0; +} + +static int byt_rt5651_resume(struct snd_soc_card *card) +{ + struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card); + struct snd_soc_component *component; + + if (!BYT_RT5651_JDSRC(byt_rt5651_quirk)) + return 0; + + list_for_each_entry(component, &card->component_dev_list, card_list) { + if (!strcmp(component->name, byt_rt5651_codec_name)) { + dev_dbg(component->dev, "re-enabling jack detect after resume\n"); + snd_soc_component_set_jack(component, &priv->jack, NULL); + break; + } + } + + return 0; +} + static struct snd_soc_card byt_rt5651_card = { .name = "bytcr-rt5651", .owner = THIS_MODULE, @@ -686,13 +728,10 @@ static struct snd_soc_card byt_rt5651_card = { .dapm_routes = byt_rt5651_audio_map, .num_dapm_routes = ARRAY_SIZE(byt_rt5651_audio_map), .fully_routed = true, + .suspend_pre = byt_rt5651_suspend, + .resume_post = byt_rt5651_resume, }; -static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; -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 const struct x86_cpu_id baytrail_cpu_ids[] = { { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 }, /* Valleyview */ {}