From patchwork Fri Jan 20 10:25:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Astrid Rost X-Patchwork-Id: 644664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9BE1C05027 for ; Fri, 20 Jan 2023 10:27:55 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F13513088; Fri, 20 Jan 2023 11:27:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F13513088 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674210474; bh=UQbkVhpMTpgnTILbluOV+VuN9hK/Oq7ugvCkZKxXYuo=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=arywTU0/zyYSKgcjhAjJ8WvBq28wFI9H7CqW2FjKoD+nQsfL/Y989L6Xuhsv3saXF sMA1UnO++B/Azzj0IfEpf93Sbqfgy3hJweJo0X0dniI3dxCoLH4W0fRRMwGQ+rIz5X fgi71Ns+mbIROYvNqnjNrtfxxHhM34xwnimdHXAs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D3774F80549; Fri, 20 Jan 2023 11:26:14 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A80CFF80482; Fri, 20 Jan 2023 11:26:11 +0100 (CET) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 78985F8026D for ; Fri, 20 Jan 2023 11:26:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 78985F8026D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=axis.com header.i=@axis.com header.a=rsa-sha256 header.s=axis-central1 header.b=mXzZx7lv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210366; x=1705746366; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vpu9tETurwEUff35qr7E5xH/0FKUrT9IUn9FLfI3fJw=; b=mXzZx7lv38ll3sBCvwzKA4NuSFEAkOiN+tFn10/pPe5kyUt9tCDtuSPa cGLnLlN8NiZz1EACkA2KNj3mB3BISFndQ3TZ/0TpmHXOAfW/WHsJkeNGH TBryKQuMxpDvUaVkvx9U1eavtqZzT0aiutZdmM/egE3YeQ804VZpFMb18 P8dXFnvv/fhg6Y7IL2bmAFEmAi2P+fjdB8xOw/oXgKTwm7f+YKI0dLR17 gBRFk80m61Eya+XALMRMfxGNuug0YQRUiaR0mkyL7afG0+dlpmXCe9N3g ypQsFMyul5k/c/hrdrthy5U/tt4mH5u3fMVqPGJuBAItXmo2qcG+GCX4u g==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 2/4] ASoC: simple-card-utils: create jack inputs for aux_devs Date: Fri, 20 Jan 2023 11:25:52 +0100 Message-ID: <20230120102555.1523394-3-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 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: , Cc: alsa-devel@alsa-project.org, kernel@axis.com, linux-kernel@vger.kernel.org, Astrid Rost Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Add a generic way to create jack inputs for auxiliary jack detection drivers (e.g. via i2c, spi), which are not part of any real codec. The simple-card can be used as combining card driver to add the jacks, no new one is required. Create a jack (for input-events) for jack devices in the auxiliary device list (aux_devs). A device which returns a valid value on get_jack_type counts as jack device; set_jack is required to add the jack to the device. Signed-off-by: Astrid Rost --- include/sound/simple_card_utils.h | 3 ++ sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++++++++++ sound/soc/generic/simple-card.c | 4 +++ 3 files changed, 56 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 38590f1ae9ee..a3f3f3aa9e6e 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -69,6 +69,7 @@ struct asoc_simple_priv { } *dai_props; struct asoc_simple_jack hp_jack; struct asoc_simple_jack mic_jack; + struct snd_soc_jack *aux_jacks; struct snd_soc_dai_link *dai_link; struct asoc_simple_dai *dais; struct snd_soc_dai_link_component *dlcs; @@ -187,6 +188,8 @@ int asoc_simple_parse_pin_switches(struct snd_soc_card *card, int asoc_simple_init_jack(struct snd_soc_card *card, struct asoc_simple_jack *sjack, int is_hp, char *prefix, char *pin); +int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, + char *prefix); int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li); int asoc_simple_remove(struct platform_device *pdev); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index e35becce9635..56552a616f21 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -786,6 +786,55 @@ int asoc_simple_init_jack(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(asoc_simple_init_jack); +int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) +{ + struct snd_soc_card *card = simple_priv_to_card(priv); + struct snd_soc_component *component; + int found_jack_index = 0; + int type = 0; + int num = 0; + int ret; + + if (priv->aux_jacks) + return 0; + + for_each_card_auxs(card, component) { + type = snd_soc_component_get_jack_type(component); + if (type > 0) + num++; + } + if (num < 1) + return 0; + + priv->aux_jacks = devm_kcalloc(card->dev, num, + sizeof(struct snd_soc_jack), GFP_KERNEL); + if (!priv->aux_jacks) + return -ENOMEM; + + for_each_card_auxs(card, component) { + char id[128]; + struct snd_soc_jack *jack; + + if (found_jack_index >= num) + break; + + type = snd_soc_component_get_jack_type(component); + if (type <= 0) + continue; + + /* create jack */ + jack = &(priv->aux_jacks[found_jack_index++]); + snprintf(id, sizeof(id), "%s-jack", component->name); + ret = snd_soc_card_jack_new(card, id, type, jack); + if (ret) + continue; + + (void)snd_soc_component_set_jack(component, jack, NULL); + } + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_init_aux_jacks); + int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li) { diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index feb55b66239b..e98932c16754 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -623,6 +623,10 @@ static int simple_soc_probe(struct snd_soc_card *card) if (ret < 0) return ret; + ret = asoc_simple_init_aux_jacks(priv, PREFIX); + if (ret < 0) + return ret; + return 0; } From patchwork Fri Jan 20 10:25:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Astrid Rost X-Patchwork-Id: 644665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D50DC05027 for ; Fri, 20 Jan 2023 10:27:04 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3E5633077; Fri, 20 Jan 2023 11:26:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3E5633077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674210422; bh=/cYsyk6S8mKmdkJVw8NuthCs9s4VSCdzI66QCpUJD8Y=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=XxPmFervopCKH9e8jYxguMCcjYgbJlNcxLrvKr3v0XEPu6mpWa4/LXEx+63XfFh9i aUhmJrZt1jCU9rD3VLsgVKa+vBLtl4PzcdNKUOpgKcREgEEAet6DHc9XIyzdaB86B1 KiW+nB7Iu4pgJHUG7LoZPo3j4heie8xjRrv14UOc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D9B28F8026D; Fri, 20 Jan 2023 11:26:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E431FF804FE; Fri, 20 Jan 2023 11:26:09 +0100 (CET) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 55319F800F0 for ; Fri, 20 Jan 2023 11:26:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 55319F800F0 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=axis.com header.i=@axis.com header.a=rsa-sha256 header.s=axis-central1 header.b=cS3zSBYi DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210365; x=1705746365; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U2imJO+1R/ob6ECocsNc0QXBaMhDnHjJe1WKPivTPyc=; b=cS3zSBYiP6ELvWA5DFzEW/5wbkEsy3SrmwX0mrege+DuFVl8LqKghAPR pSJQRRbbTaqKzFNyd5H3XuUdNpJQuHKwxfVJEX5CFyytmu+jfGWmeBTdD KO3DA19EP8pX8cE78nEHW8m1xhRxIdU9WPc65kGt/DyKuwMcqoboZXWor Yah4mLgIftYbPJ8rvTKEponll+UiA6Trg41M14JNOgNCm1U9vb3KJg1WL wKyuZsqcTpMgfwIyhAOD83vxjZyXtZ79l1U+hHaas/AFOqUEu4HlEFz9j HbGJ5x1xoUPsErydFBHclJjCdI9plZRHd4QlEYFeKaLVeAxCXIRHJQJ1r w==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 3/4] ASoC: ts3a227e: add set_jack and get_jack_type Date: Fri, 20 Jan 2023 11:25:53 +0100 Message-ID: <20230120102555.1523394-4-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 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: , Cc: alsa-devel@alsa-project.org, kernel@axis.com, linux-kernel@vger.kernel.org, Astrid Rost Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Add set_jack and get_jack_type to allow simple-card-utils to add a jack for it. Add a devicetree entry jack-type of type snd_jack_type, in case not all input types are required. Signed-off-by: Astrid Rost --- sound/soc/codecs/ts3a227e.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c index 2305a472d132..432a327c6eb7 100644 --- a/sound/soc/codecs/ts3a227e.c +++ b/sound/soc/codecs/ts3a227e.c @@ -28,6 +28,7 @@ struct ts3a227e { bool mic_present; unsigned int buttons_held; int irq; + int jack_type; }; /* Button values to be reported on the jack */ @@ -258,7 +259,27 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component, } EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect); -static struct snd_soc_component_driver ts3a227e_soc_driver; +static int ts3a227e_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *jack, void *data) +{ + if (jack == NULL) + return -EINVAL; + + return ts3a227e_enable_jack_detect(component, jack); +} + +static int ts3a227e_get_jack_type(struct snd_soc_component *component) +{ + struct ts3a227e *ts3a227e = snd_soc_component_get_drvdata(component); + + return ts3a227e->jack_type; +} + +static const struct snd_soc_component_driver ts3a227e_soc_driver = { + .name = "ti,ts3a227e", + .set_jack = ts3a227e_set_jack, + .get_jack_type = ts3a227e_get_jack_type, +}; static const struct regmap_config ts3a227e_regmap_config = { .val_bits = 8, @@ -283,6 +304,12 @@ static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e, u32 setting3_mask = 0; int err; + err = device_property_read_u32(dev, "jack-type", &value); + if (!err) + ts3a227e->jack_type = value & SND_JACK_HEADSET; + else + ts3a227e->jack_type = SND_JACK_HEADSET; + err = device_property_read_u32(dev, "ti,micbias", &value); if (!err) { setting3_mask = MICBIAS_SETTING_MASK;