From patchwork Mon Feb 12 12:41:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128042 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3195811ljc; Mon, 12 Feb 2018 05:11:45 -0800 (PST) X-Google-Smtp-Source: AH8x2279bCSu5gX8rtsBYVfLYfGgGeaHbF3IfAsr70ar4Bb9wDFmVMzxF4/DB+Ka7m83sJWuQ4QU X-Received: by 10.28.67.194 with SMTP id q185mr3399036wma.76.1518441105141; Mon, 12 Feb 2018 05:11:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518441105; cv=none; d=google.com; s=arc-20160816; b=vP1vPcy9NfemvukUnomayo6ahlkAk1eVfaBvqqvB2eHcAqpulhbji1vJF1Ngs6and0 Uwzfma4hfTZyz/BYNuDbZP9dIGbkYZaIrh/H6Sa0/GsZ/n5QHjGytnrEAVM78RPBEn2Z RD/u2v+XJa10wG87BVnUJMvB6RDasazGam/V3rN0yKpc0cwMfZ7AFH6s75nvtTQpr5ut Qyd5IKJBvieKcAhYk7wx/IzitGZ3p330b8tKpaa2+BecW4kjB13XAoeKhj5wdIHi9ViA Xmomtelm3ndG0DHrSiMl030oPNS+NAvx6MdJxLpw9GtL7p7RcY5QLNxj5GT/yBxIoIdX noUg== 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=7QKNzevvLK899qp5rbxTmyjJvBZ+8KpOAWQhCO1kEzU=; b=yqtejDbH82aoO7jT9s06tUHS0S9T4ZT4kcmkd0pa2KwhaZYYavD+2/S0M4hm/BZSZK fCi5O1lx1XzfRiFEwxORD+MrY+4Bsv6Xn1lk8hJvmWrrxXyC68ZzgueQlUhI9NuPNA+B 3jNUfOT6Iw68y3ltlO3NEMeIRuAoyygs7KICt7CfDxOvEydGPe1uQ/6tt2yoqDDaAPqX lfvAlaOWJOEh7WJvrNWMnvyeC0AGYle/icNmvEK1UvuqrNOrsSoKHL5ERXQMQ7SJd79m rmnZ9HF4zzzCwwgNHf09I4JSDmhL2hjRROm2znsYY4RrSJlCRvp1lM2QkvfmfXcqqpwH V/tA== 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=gjNA+7CS; 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 t22si6224915wrb.163.2018.02.12.05.11.44; Mon, 12 Feb 2018 05:11:45 -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=gjNA+7CS; 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 C594C267BA4; Mon, 12 Feb 2018 14:11:43 +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 EFAAB267BA3; Mon, 12 Feb 2018 14:11:42 +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 64C032679A5 for ; Mon, 12 Feb 2018 13:41:06 +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=Ie7dfkh/rnt/yYdGPLCcyxIgmEBqZq3GAwr6v9EiLTU=; b=gjNA+7CSjAXl 8VOeb4HlBfiO0/QFZwLd0SbMY+gWQbN0o1fvlQDjOTmTmUgDEgMK0n/B7VhTiHBQoss6eTuPPO97L gF0ga9JU5t558fUj4Tpcrk601ZLp/f/LLUAwmZC8TCJ83bUkgTlpVaOm45+8M0OFpO/IjxM4aKeQL wLWbU=; 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 1elDPs-0002Eg-Fu; Mon, 12 Feb 2018 12:41:04 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1elDPs-0004mD-2E; Mon, 12 Feb 2018 12:41:04 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87h8r5z4rr.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 12 Feb 2018 12:41:04 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: max98357a: 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: max98357a: 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 4b51e9f1c386dbd7bd7bc5a342a6ac90a6c54904 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 29 Jan 2018 04:09:20 +0000 Subject: [PATCH] ASoC: max98357a: 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/max98357a.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 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/max98357a.c b/sound/soc/codecs/max98357a.c index 426ed2dae6ca..d469576b5a7b 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -59,27 +59,29 @@ static const struct snd_soc_dapm_route max98357a_dapm_routes[] = { {"Speaker", NULL, "HiFi Playback"}, }; -static int max98357a_codec_probe(struct snd_soc_codec *codec) +static int max98357a_component_probe(struct snd_soc_component *component) { struct gpio_desc *sdmode; - sdmode = devm_gpiod_get_optional(codec->dev, "sdmode", GPIOD_OUT_LOW); + sdmode = devm_gpiod_get_optional(component->dev, "sdmode", GPIOD_OUT_LOW); if (IS_ERR(sdmode)) return PTR_ERR(sdmode); - snd_soc_codec_set_drvdata(codec, sdmode); + snd_soc_component_set_drvdata(component, sdmode); return 0; } -static const struct snd_soc_codec_driver max98357a_codec_driver = { - .probe = max98357a_codec_probe, - .component_driver = { - .dapm_widgets = max98357a_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98357a_dapm_widgets), - .dapm_routes = max98357a_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(max98357a_dapm_routes), - }, +static const struct snd_soc_component_driver max98357a_component_driver = { + .probe = max98357a_component_probe, + .dapm_widgets = max98357a_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98357a_dapm_widgets), + .dapm_routes = max98357a_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(max98357a_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct snd_soc_dai_ops max98357a_dai_ops = { @@ -107,14 +109,13 @@ static struct snd_soc_dai_driver max98357a_dai_driver = { static int max98357a_platform_probe(struct platform_device *pdev) { - return snd_soc_register_codec(&pdev->dev, &max98357a_codec_driver, + return devm_snd_soc_register_component(&pdev->dev, + &max98357a_component_driver, &max98357a_dai_driver, 1); } static int max98357a_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_codec(&pdev->dev); - return 0; }