From patchwork Mon Feb 12 12:36:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128021 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3172969ljc; Mon, 12 Feb 2018 04:44:51 -0800 (PST) X-Google-Smtp-Source: AH8x2244826HlhziVAjGf2XInDlH8tAwnfbkEH+F4T0QsfgjAPSj6Lyy7JRfqktMYReRRrh9Sj0u X-Received: by 10.28.235.6 with SMTP id j6mr3154125wmh.22.1518439491054; Mon, 12 Feb 2018 04:44:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518439491; cv=none; d=google.com; s=arc-20160816; b=Lcl0bauD55W67ShtMU9+pzY+TNWmipUToVVC2mXmOmTFjl5qvpFNW9GlgCd40qGUs3 mYaueHEkriyN1YXoUjwBE4jW3a9SqgKEgRk4L5jvG9RixmyEEZ3Lj7uyCNMkvRofJ2Xu 6TfvSunl68cJUSS+UKQoW7OqaxgOsquAhkB8u6Lvd+5eFZRFQxbYHtft4aTShoeiy7Xw VBEBtpSFcFDOdVdEkJtyt9RDoT/tpeAkffHhrYTzbBuURAtM4Tp/9LRedoSaMFgu6Z36 8MzBPU1vDeVUhRfJa24rM5EyrZtd7L0j/IkNMaSZYTllL0UqTtFf223IWczi4glk7pKl e+Vw== 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=p9xvMSeo7xXC41IrqaqwbX+KZpc2pI7udtkIJxGvGyw=; b=qQD4cDr9Nsc5KxS9SJhzCp7uYALmDVSY2bN4JyIjS8i6tWHQEHHEx4Z1Q+jzVgITvy 3T5jybH6m52NBzlttwBkxvqVDr8rp+Z9rMc4RqzJ52t1NJCU/igXPL5VQ1Yb3Moj4emT fZDIMaJl+azaq8hLwEv+r41Wb2zY5yrlVGn59QoUea5BD32Hm+GPxx9IK2HYgbHz+yRg jEXmnVTSZyRlF4TkHn/o+rqQTvw4cGdYvJE+wAd5IkUhR0buBEkFiq7Y/bWj2lz35fen Jn31dK3AGI8LexCeOwtpsdRkS1PzPW5hsF+gwjlGOQAuzXTTsIT1uoTSLZps63NNpiMC yjIA== 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=r9Q31aFD; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id b189si3680818wmf.115.2018.02.12.04.44.50; Mon, 12 Feb 2018 04:44:51 -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=r9Q31aFD; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8716E2678AC; Mon, 12 Feb 2018 13:44:47 +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 104F92678AC; Mon, 12 Feb 2018 13:44:46 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 E1F30267A4D for ; Mon, 12 Feb 2018 13:36:15 +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=6xq7OPKlILvAPCDW2whs5WiwkMEXAgHMqNzDSdkWYoo=; b=r9Q31aFDgq8B c8ERh2eIJNAMFshKZQ+e4WT7/rTzW82NqpHHJoSobYxmHC4s+PadmTk0axy48wiMQZVbdELg3XRnS xNI6nLcirb4nA0ydjX5CSl4PGiUIMkGw0U412OsftNU/RVyDAQstyZDw7OeQ7kMKynIfQpiCPW9OZ ZctmI=; 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 1elDLC-00024z-7D; Mon, 12 Feb 2018 12:36:14 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1elDLB-0003r8-PP; Mon, 12 Feb 2018 12:36:13 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87o9lduvmh.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 12 Feb 2018 12:36:13 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: dmic: replace codec to component" 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: dmic: replace codec to component 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 6d6c3946d877adf1e73c6292f947bbb687452ed5 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 29 Jan 2018 04:40:29 +0000 Subject: [PATCH] ASoC: dmic: replace codec to component Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/dmic.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index cf83c423394d..32a8f71d51f1 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -71,16 +71,16 @@ static struct snd_soc_dai_driver dmic_dai = { .ops = &dmic_dai_ops, }; -static int dmic_codec_probe(struct snd_soc_codec *codec) +static int dmic_component_probe(struct snd_soc_component *component) { struct gpio_desc *dmic_en; - dmic_en = devm_gpiod_get_optional(codec->dev, + dmic_en = devm_gpiod_get_optional(component->dev, "dmicen", GPIOD_OUT_LOW); if (IS_ERR(dmic_en)) return PTR_ERR(dmic_en); - snd_soc_codec_set_drvdata(codec, dmic_en); + snd_soc_component_set_drvdata(component, dmic_en); return 0; } @@ -95,14 +95,16 @@ static const struct snd_soc_dapm_route intercon[] = { {"DMIC AIF", NULL, "DMic"}, }; -static const struct snd_soc_codec_driver soc_dmic = { - .probe = dmic_codec_probe, - .component_driver = { - .dapm_widgets = dmic_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), - .dapm_routes = intercon, - .num_dapm_routes = ARRAY_SIZE(intercon), - }, +static const struct snd_soc_component_driver soc_dmic = { + .probe = dmic_component_probe, + .dapm_widgets = dmic_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int dmic_dev_probe(struct platform_device *pdev) @@ -129,16 +131,10 @@ static int dmic_dev_probe(struct platform_device *pdev) } } - return snd_soc_register_codec(&pdev->dev, + return devm_snd_soc_register_component(&pdev->dev, &soc_dmic, dai_drv, 1); } -static int dmic_dev_remove(struct platform_device *pdev) -{ - snd_soc_unregister_codec(&pdev->dev); - return 0; -} - MODULE_ALIAS("platform:dmic-codec"); static const struct of_device_id dmic_dev_match[] = { @@ -152,7 +148,6 @@ static struct platform_driver dmic_driver = { .of_match_table = dmic_dev_match, }, .probe = dmic_dev_probe, - .remove = dmic_dev_remove, }; module_platform_driver(dmic_driver);