From patchwork Mon Jun 18 12:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 138902 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3866362lji; Mon, 18 Jun 2018 05:01:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLBa79fV1UOy+rA4/vDuHHfAaZHGfoRefCbcRTo7EBrQLykQi33DyYQyH3bS67kvXXmZitN X-Received: by 2002:a1c:4845:: with SMTP id v66-v6mr8286899wma.56.1529323314173; Mon, 18 Jun 2018 05:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529323314; cv=none; d=google.com; s=arc-20160816; b=qJLczQSi44Eo3jVPe9m9FnFKQb5aF/gfDHCvbuCqSC1iY1FRcDIsTMudLKxRCvEoVZ 6TiZCojyO9MxtdcSAMVLFoN9Tw329U1wRk9Y63S+3giM3LFsTh63jKPmkD6FwX9yrR49 /1XhTkHxr09CMHvzmzhfnzouCYEL+k+7yyw6JLgowKLqByUr8w8rrs4gVS4x7132/fYC W5FPraRQIE/W8TnSgZAfwDO5rUM6Etm/cItVu48Mqs68jiZo6Ywh9Vn0wULqO7dd9wXs MwcXtWnel2eoolawT31nTQqBWkJuoUqUMdh3MSY1JGLjcuXNUO0aEIHcyWS/GttQ7ZRN 4gbw== 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=+qFnXd+T6inRvPmXYmcsM+HWVDfGY9Mxp+WmLvQQCFE=; b=HUyJc+BhOJT5vP6EjtuqrDuviwbh+BkHj/eFLwET15gt6vdWrbV7v1AE9iPXBSye9u Zrxl/BNeD9b0LhzlvG2qlKLfW9X6naeWZoXbe2hWbQQtrVVUKqwPjreeYref7OppKV6K F9aJluAcGb7jDW5glZUdPAVEgdR7cdlXTkAIjB6t6Bi4q1UWhlbXINgwpAvUqBtPX0m2 dK11LgrHUGoVOssTBRUrOz/cmPxBZGNo66P25OuuUTlZYh1i3ZmamGWbwzQJ+gTysnJS Ls907XaLWHv1eBSyhrNe48b9YUypdAGQeU3pb9ZZ4YPTR6q87Td4XAMan8MSHJCvSu7t B0Xg== 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=hFKSBPvy; 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 r105-v6si2487946wrb.381.2018.06.18.05.01.53; Mon, 18 Jun 2018 05:01:54 -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=hFKSBPvy; 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 461AA267734; Mon, 18 Jun 2018 14:00:28 +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 8E0972676E7; Mon, 18 Jun 2018 14:00:23 +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 41C44267713 for ; Mon, 18 Jun 2018 14:00:19 +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=ZYeAf3woEKXy4ukDQ/rNTDHULGUFX4NZwDmFcfPYx0M=; b=hFKSBPvyNUaw VEUV8jVRLnt6D8E1ohbd86RPxzMInjJyveCBq0IHC6vpES2QR16/zeLlV+R2V9VDSQxznlHmQkoCs fD/aLT+pBYZXEi+aQWJi4OL6WsIXMs4YZ6WgfigC1OqGms89c2p1mMSS3DhWJ5Z4jZ2419LRbr+72 OWeyA=; 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 1fUspO-0007xx-6b; Mon, 18 Jun 2018 12:00:10 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fUspN-00008A-PJ; Mon, 18 Jun 2018 13:00:09 +0100 From: Mark Brown To: Katsuhiro Suzuki In-Reply-To: <20180611051559.18082-3-suzuki.katsuhiro@socionext.com> Message-Id: Date: Mon, 18 Jun 2018 13:00:09 +0100 Cc: alsa-devel@alsa-project.org, Masami Hiramatsu , Kuninori Morimoto , linux-kernel@vger.kernel.org, Jassi Brar , Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: audio-graph-card: add hp and mic detect gpios same as simple-card" 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: audio-graph-card: add hp and mic detect gpios same as simple-card 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 f6de35cc145fb55d842db94e74841ecd8382e012 Mon Sep 17 00:00:00 2001 From: Katsuhiro Suzuki Date: Mon, 11 Jun 2018 17:32:14 +0900 Subject: [PATCH] ASoC: audio-graph-card: add hp and mic detect gpios same as simple-card This patch adds headphone and microphone jack detection gpios as same as simple-card driver. Signed-off-by: Katsuhiro Suzuki Acked-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-card.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index d93bacacbd5b..a2a3e630f11c 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -21,7 +21,6 @@ #include #include #include -#include #include struct graph_card_data { @@ -32,6 +31,8 @@ struct graph_card_data { unsigned int mclk_fs; } *dai_props; unsigned int mclk_fs; + struct asoc_simple_jack hp_jack; + struct asoc_simple_jack mic_jack; struct snd_soc_dai_link *dai_link; struct gpio_desc *pa_gpio; }; @@ -278,6 +279,22 @@ static int asoc_graph_get_dais_count(struct device *dev) return count; } +static int asoc_graph_soc_card_probe(struct snd_soc_card *card) +{ + struct graph_card_data *priv = snd_soc_card_get_drvdata(card); + int ret; + + ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL); + if (ret < 0) + return ret; + + ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL); + if (ret < 0) + return ret; + + return 0; +} + static int asoc_graph_card_probe(struct platform_device *pdev) { struct graph_card_data *priv; @@ -319,6 +336,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev) card->num_links = num; card->dapm_widgets = asoc_graph_card_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(asoc_graph_card_dapm_widgets); + card->probe = asoc_graph_soc_card_probe; ret = asoc_graph_card_parse_of(priv); if (ret < 0) {