From patchwork Thu Mar 2 10:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 63334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4164240wrd; Thu, 2 Mar 2023 02:52:36 -0800 (PST) X-Google-Smtp-Source: AK7set8N3tqULfNnp/ZmJbW6VH5Us6BtxqWyLtL9ChnQbTOGCWxtoH8qcfaIYvgNTTVotr32sU6N X-Received: by 2002:a17:90b:2248:b0:237:8c42:27bc with SMTP id hk8-20020a17090b224800b002378c4227bcmr11733509pjb.13.1677754356030; Thu, 02 Mar 2023 02:52:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677754356; cv=none; d=google.com; s=arc-20160816; b=vfeHHmH5oJVpMIlxa9lR3VSHexojMoHXRJNVhl/palS5oE+Qxilxa8KMTz7bVgsKd/ 5q1IwFqk7bmvrscZfoyj1oMDi3aiic9ZKgYEW4hdNmM9HM7qgN0vatNqu+CKpY3oN7C6 qvjIOmWM4oGovIKthKQonM3ZH8UeX0h1Cr/yFv1cE33f/kp1TiOy9YBDvfjv2FZzCc9I YYNo85lLrH4EF2fvg0myydR7OdoFc6DbT3MGjMnCXB6+EeYcPFV4B8h5VSbQTyXvEHd4 NrqErl4Avu09Msg5x43gkvYskW2/b6Sti+CYEHBpB8hYAvzuKVFIrL1GWn+6dnA3cfh6 iBzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GO6tJSKGhuKgdHNgP3IEYgtiqFiDG7WtsDPxWBs+xKc=; b=q9kLKbie2j80IDf8+UhkMtSJXvkqAsYPEEUiKCCk4UeTih0Ry6TiUQrE65Ux9OeUU4 Kq1yg1c1oRRh+shEcY9Lltx8sZfHa6MCNcM/JHKJSn37woqauXPyBzmyRgmhrALZZUvF 3EelYMG8UBdlK2bP+7JomQgxyM5zUqJG+mQQ8S5GEfmRlLngMXSNpAdvgKwwIOvIiAn3 64T3duhGuQ7YgVyGuI15/hN0HgcrSygmjZepGU4CpbWfrN0VZd/LxnprwOnkUJbZ1dQb 7XK+CLHHRvlgaRZUIKu4ukKk5ixtbhhGVO6HzcSZbCULHMAotRW2jwzM3IvIYBSHCPGN DCDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E6+g09by; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gv9-20020a17090b11c900b0023407d4ebe0si2005170pjb.114.2023.03.02.02.52.22; Thu, 02 Mar 2023 02:52:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E6+g09by; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229968AbjCBKqi (ORCPT + 99 others); Thu, 2 Mar 2023 05:46:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjCBKqg (ORCPT ); Thu, 2 Mar 2023 05:46:36 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5B393771B for ; Thu, 2 Mar 2023 02:46:34 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so1218943wmi.3 for ; Thu, 02 Mar 2023 02:46:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677753993; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GO6tJSKGhuKgdHNgP3IEYgtiqFiDG7WtsDPxWBs+xKc=; b=E6+g09byyy+IW3IG+Z9rsgrNe2X8rBBoRl7EopRxtys36mVnmVl5GRdCVC8JuNM10g GT3Zmpbo3cfkeicd92FRIGrMY4kLlwlRc+r0MLqTH//P1e0uI/ZOnYhkoUsr5csmBALM FI7a9REbNUHREnzPKLZWtmQBSSRLg/JCf+oAus7LGmxe21A002xt2d8X5o7Ph7P3TqlC TZhVS0Bqu6H1GBQiW+itYbN/QoNQ1p8jf+vOoAmbQAsjIDnkTyaWMz/5QniNcaSTnj/X beYJCZbaKW8ELycRSIW1cCBDA6EaNd48Hi6e4iF3F/qnkHCIEEPbt2WFPipyg/y9KC8k TwSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677753993; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GO6tJSKGhuKgdHNgP3IEYgtiqFiDG7WtsDPxWBs+xKc=; b=pN3Ts/0jA3Zcid4stW2/A9szIzvqxH4xmPPpPVDfnMecgBSDJyr6B8yAOjRdfSXeT9 Q+7S11uT9AhhYHner4mQeTIPYe6ri2P3inZCb6ocFFG8yVYi3/LzpedBDpk5W1yTjyYA AFjZw05xOzHdi7LmcemfW8+7rSVxkH2QSf55iiWoo3z6GCUV6MDIikn1U4ZXOU9g2KoS WgtVWMmjeLm5afXIeJvPNhFxgikAUnErdhYj6+emVhWSZUDLly7rBfohwe8bMHWrniUK Xx1RzmCDbtee2F3G4mnkop7TNW6Rl7jwPlNSqodRAO5D4yZ+Mm9lBpRX26e5z0N3zxlZ ADYw== X-Gm-Message-State: AO0yUKUv468X0Gw+vwcqS+/csv7IYK6btpyZ3+ImHVUsZP/8k+u0e8A+ uTIP39GzYUJG+Ud/AD9hQzLftA== X-Received: by 2002:a05:600c:1608:b0:3df:e41f:8396 with SMTP id m8-20020a05600c160800b003dfe41f8396mr7078567wmn.37.1677753993153; Thu, 02 Mar 2023 02:46:33 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id iz2-20020a05600c554200b003e11ad0750csm2522592wmb.47.2023.03.02.02.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 02:46:32 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH] ASoC: qcom: common: add kcontrol to jack pins Date: Thu, 2 Mar 2023 10:46:16 +0000 Message-Id: <20230302104616.26318-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759252951385649258?= X-GMAIL-MSGID: =?utf-8?q?1759252951385649258?= Add Kcontrol to jack pins so that device switch in ucm can be done correctly. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/common.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 96fe80241fb4..c1f24af17506 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -180,6 +180,18 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } EXPORT_SYMBOL_GPL(qcom_snd_parse_of); +static struct snd_soc_jack_pin qcom_headset_jack_pins[] = { + /* Headset */ + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) { @@ -189,13 +201,14 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, int rval, i; if (!*jack_setup) { - rval = snd_soc_card_jack_new(card, "Headset Jack", + rval = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT | SND_JACK_MECHANICAL | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5, - jack); + jack, qcom_headset_jack_pins, + ARRAY_SIZE(qcom_headset_jack_pins)); if (rval < 0) { dev_err(card->dev, "Unable to add Headphone Jack\n");