From patchwork Wed Nov 28 16:05:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 152309 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1268601ljp; Wed, 28 Nov 2018 08:06:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/XqgyQoCPg3b8GKl4FTtAV/N7JaKGSltKPcg+jdn0QrZTqd1G2fVYCFKvBdesY3LZypMGyl X-Received: by 2002:adf:9d08:: with SMTP id k8mr25317543wre.203.1543421179639; Wed, 28 Nov 2018 08:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543421179; cv=none; d=google.com; s=arc-20160816; b=H5axxCneAyw4sG96FxsbBxTPb9ZjsO1wto+mXMtDk5M7T/L95s8VAGx1QHQdfCTVRD fkGUF8AVHz9ehoOWAtDtv686UddPRn8Ik4nCZQIiE9aGmQcIU0lceCjRoED5QPEYF13i k3XKFGvgjS7cjUq03nzByRQkvEjp+8b/xSPxUL4OST2ozr67Sdrl1x6+iKokTVEkmDjE tooe6PA5kTDeRmNa1s3HcYjt81lktvnfKorYPXqjsvSYcALi6jW7922rS5udFAmWQorV uyVKxMa6P/LBF+nz94MQtveGeRI8GYB4ga75HleKH9UQmPxlfIxdkBIsW/R4Rf5iXTyp GVYg== 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; bh=D1cmybc+C8j1StBNN//2klpi226xMC7xkABzBiM2Ln0=; b=Yz0xlUol6LkI+d9LPSYHa20zmkCm15XRipe4GEPYAE6UXQsplf9jOOBGzrTxoddDOQ NKD70iHpfPWm1pR4OqIbn/U01yUT5SlPNmbQHW4w881jRc5pC9HSIBhZLlzuWPG8tkoq 0GLGywO0Ru2GPGD9u6eYDP+01fd1aCzG1udT38SSCVWL424QwYqTN5vkv8h0GGJPQsaK 91A7urHBFlN4bgHUPE18dbvBwGcz+YY7S9nmNZzm0wJ84VPC6/5/1Nv/A1z3GulzkF5m bbVBVodYssyZvEPgHJE9WffqYK3u8xTH+KBfpTHuUuk7K/zzmGOH5h89ZYo1KPZsjh7t bNag== 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=L0MnPzw6; 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 q186-v6si2253563wma.72.2018.11.28.08.06.19; Wed, 28 Nov 2018 08:06:19 -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=L0MnPzw6; 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 703B0267B84; Wed, 28 Nov 2018 17:05:33 +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 CBF18267B76; Wed, 28 Nov 2018 17:05:28 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE 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 27E95267B01 for ; Wed, 28 Nov 2018 17:05:27 +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=LbVT/FkABjuNhWEHVEzHTt0VLUVSJEiLbcOHppQHp9I=; b=L0MnPzw6q0Kp U6vvv09b3DfsyEQg3MZYZRTaeQSZ1ie1rrhwzOz3VHsHdWJ1qgh4EKkYMlvwYivO2LE3Tz+ti9BmB l5/BM7gfiLKOmhb8My39ncaJhjm2opFTljHWhZ3R7t6z/cJKa9t8DrUp0hHA29zqdcd1nMu2CLZvv fpomc=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gS2L8-0005wz-Og; Wed, 28 Nov 2018 16:05:26 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 6F541112521B; Wed, 28 Nov 2018 16:05:26 +0000 (GMT) From: Mark Brown To: Cheng-Yi Chiang In-Reply-To: Message-Id: <20181128160526.6F541112521B@debutante.sirena.org.uk> Date: Wed, 28 Nov 2018 16:05:26 +0000 (GMT) Cc: Srinivas Kandagatla , alsa-devel@alsa-project.org, Mark Brown , Rohit kumar Subject: [alsa-devel] Applied "ASoC: qcom: sdm845: Add board specific dapm widgets" 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: qcom: sdm845: Add board specific dapm widgets 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 7f1806ebb08cc28e17dc3320790a01ccdff3d17d Mon Sep 17 00:00:00 2001 From: Cheng-Yi Chiang Date: Sat, 24 Nov 2018 19:09:45 +0800 Subject: [PATCH] ASoC: qcom: sdm845: Add board specific dapm widgets Add board specific dapm widgets so these widgets can be used in the route. Signed-off-by: Rohit kumar Signed-off-by: Cheng-Yi Chiang Acked-by: Srinivas Kandagatla Signed-off-by: Mark Brown --- sound/soc/qcom/sdm845.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.19.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/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 58593db2ab15..95d8d4422dae 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -212,6 +212,14 @@ static int sdm845_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } +static const struct snd_soc_dapm_widget sdm845_snd_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), +}; + static void sdm845_add_be_ops(struct snd_soc_card *card) { struct snd_soc_dai_link *link; @@ -243,6 +251,8 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) goto data_alloc_fail; } + card->dapm_widgets = sdm845_snd_widgets; + card->num_dapm_widgets = ARRAY_SIZE(sdm845_snd_widgets); card->dev = dev; dev_set_drvdata(dev, card); ret = qcom_snd_parse_of(card);