From patchwork Tue Jul 3 15:06:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 140972 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1277361ljj; Tue, 3 Jul 2018 08:06:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpep+uq/jjE9VrIMRpGObT3tYH42ALlS0lc63TUoHnegKA1YwLg+4T/UMFZZTDE/IfeHDdXq X-Received: by 2002:a1c:ad42:: with SMTP id w63-v6mr2189585wme.100.1530630397932; Tue, 03 Jul 2018 08:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530630397; cv=none; d=google.com; s=arc-20160816; b=ZsS2LsnPgtCDO0yA9VWrmPKaZZo85UVLB9PSCUScNageaSFAd98buCxRmhQD7+jRcN KF8nC5AQ8lmQ7O+ECPQiSLWbAX/+/KuRofoDxGOxhpodOLrX1BhricAx0Q2qfiIKQQvW tmOd9AoPw5nJxd9zfR0PdNeuG5wN6xMLQUID2wdKValwn/5phXrsVl0AQ9W9cr/YDU0m 2uIM4zuxNqqmdnB2/biJje4yswIn0EiBJ66fOu/1Jw+zAVpkIsTNazSzSZfQ7YigNmaa D+nU2nFT+3sz1FGDnyd5hMC41U3nd2Tg6uc5kFMJayMwX1QeHk51mBo5O4c5NIfGX5N7 BHPQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=JuWUpw3O9p6HgedsowS8GYSAfEFuhZdknkl/cUlY7UE=; b=n/d9pgTiAaF9e12WDutKpiE1nVqX5QuZbFvhRn4TGGR6baATfTSgrwrQ/z1IU72p37 95cY7S6/dktRFxrsNU7F6nnGa23VS7J/CLONGkZiSN+LJxeEzkFxxkGM+mYVWugTAJyt +qeBKRfpimQHEbNySOitygUBb/dMKQ82zICUyRORAwFklsC0xFeWzkXot2i3YzE8EBfT +KVeyiert3zIDMwPyW4e8csYnmjohZ7fVIXke9SLHNffDZTW/6DC5TrDTJcN5VqEsvx4 pPj9DQJR8LjBRZOwf+eTZ0Q2/th4xkCmzNWtFSSLXPe+/bshPKqJf6f5i/o+0nL4uac6 RJrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=S70QXul1; 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 p200-v6si1199295wmd.66.2018.07.03.08.06.37; Tue, 03 Jul 2018 08:06:37 -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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=S70QXul1; 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 95351267720; Tue, 3 Jul 2018 17:06:19 +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 4F3E526775C; Tue, 3 Jul 2018 17:06:13 +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=1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_SOFTFAIL,T_DKIMWL_WL_MED autolearn=disabled version=3.4.0 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by alsa0.perex.cz (Postfix) with ESMTP id AA7F2267720 for ; Tue, 3 Jul 2018 17:06:09 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id t6-v6so2335065wrn.7 for ; Tue, 03 Jul 2018 08:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BfIwYZonNLacADKQn94fU9JnfG5VCfHAstjGwmYSXBI=; b=S70QXul1/iS8qluhhbVdwHAXRplSDvFB8j/9qpAIZjJzcBQS0Odq5L7LKHrKo0CWWU jD6SDDJUIFHBPwBBpRu7kI/+BNcXghXY6mHm5hEveF2eoSL+iD76wfvXuhOYpNZuZUPn xQl21IX9xXDVzrtCtTl0kJIjaobHQC9Wb4UUDkON77LqaFxhwaCHFN34mdFxqyj6rZIY /1KzlYU5/1RqDkL+z6LqufD7KjMvg4s6xpyQ0fn05YIwAH46P8jAznyr1GEstocXLFte KzLjcasJQ+f7CjymHitlH+XzNyRMIl6920nZvCI2ST0//jzDx806AMAQa0V77jDzaTTR PvnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BfIwYZonNLacADKQn94fU9JnfG5VCfHAstjGwmYSXBI=; b=O62SHg2N1iJzFIdgo5HyJTU80NnjBp0GgDOwV4EBwxo2fUzFGjOwojQLiVZqQDqjfI 8mnw6G4D0MXUBFPvnQiw0MckwYtm0mtHHXVqiGuBU54yjR78YOogmz/uxpmqVbm4qDwZ mnQJ8ChlY3fIlI9CX6SbMD/qZi/1cOjoVQ6guPRafNULrWkZABmyiOyJyjqq5fHlBAmQ OzKJKA9fysy2L77PKvpUWmaJpZeXMoi/Ru1d7pzLkr9/XpUMe0CaRfqGTslyLpNfLUJj uJLaK20xIjqwrHDaqMEsNLM4ICUEjOO/fixG+Aazu9OUwTnWTtRdEDpuCttF5Ckt4skx ifCQ== X-Gm-Message-State: APt69E2qSmvCznNU0P0BgemLp2+aYVfkeRwzB7+0BmDfCuaaP2/939qJ D9htSt6qDMhVTmOFAOXT70qmdwKy X-Received: by 2002:adf:9102:: with SMTP id j2-v6mr23831577wrj.57.1530630369173; Tue, 03 Jul 2018 08:06:09 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id x16-v6sm2905842wme.12.2018.07.03.08.06.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 08:06:08 -0700 (PDT) From: Jerome Brunet To: Liam Girdwood , Mark Brown Date: Tue, 3 Jul 2018 17:06:00 +0200 Message-Id: <20180703150600.17697-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180703150600.17697-1-jbrunet@baylibre.com> References: <20180703150600.17697-1-jbrunet@baylibre.com> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Jerome Brunet Subject: [alsa-devel] [PATCH v2 3/3] ASoC: es7134: add support for the es7154 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 Add support for the es7154 which is basically an es7134 with an embedded power amplifier and lower maximum sample rate Signed-off-by: Jerome Brunet --- sound/soc/codecs/es7134.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) -- 2.14.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/es7134.c b/sound/soc/codecs/es7134.c index 80f2936cefed..6d7bca7b78ca 100644 --- a/sound/soc/codecs/es7134.c +++ b/sound/soc/codecs/es7134.c @@ -33,6 +33,7 @@ struct es7134_clock_mode { }; struct es7134_chip { + struct snd_soc_dai_driver *dai_drv; const struct es7134_clock_mode *modes; unsigned int mode_num; const struct snd_soc_dapm_widget *extra_widgets; @@ -196,6 +197,7 @@ static const struct snd_soc_dapm_route es7134_extra_routes[] = { }; static const struct es7134_chip es7134_chip = { + .dai_drv = &es7134_dai, .modes = es7134_modes, .mode_num = ARRAY_SIZE(es7134_modes), .extra_routes = es7134_extra_routes, @@ -227,6 +229,61 @@ static const struct snd_soc_component_driver es7134_component_driver = { .non_legacy_dai_naming = 1, }; +static struct snd_soc_dai_driver es7154_dai = { + .name = "es7154-hifi", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = (SNDRV_PCM_RATE_8000_48000 | + SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S18_3LE | + SNDRV_PCM_FMTBIT_S20_3LE | + SNDRV_PCM_FMTBIT_S24_3LE | + SNDRV_PCM_FMTBIT_S24_LE), + }, + .ops = &es7134_dai_ops, +}; + +static const struct es7134_clock_mode es7154_modes[] = { + { + /* Single speed mode */ + .rate_min = 8000, + .rate_max = 50000, + .mclk_fs = (unsigned int[]) { 32, 64, 128, 192, 256, + 384, 512, 768, 1024 }, + .mclk_fs_num = 9, + }, { + /* Double speed mode */ + .rate_min = 84000, + .rate_max = 100000, + .mclk_fs = (unsigned int[]) { 128, 192, 256, 384, 512, + 768, 1024}, + .mclk_fs_num = 7, + } +}; + +/* Es7154 has a separate supply for digital I/O */ +static const struct snd_soc_dapm_widget es7154_extra_widgets[] = { + SND_SOC_DAPM_REGULATOR_SUPPLY("PVDD", 0, 0), +}; + +static const struct snd_soc_dapm_route es7154_extra_routes[] = { + { "Playback", NULL, "PVDD", } +}; + +static const struct es7134_chip es7154_chip = { + .dai_drv = &es7154_dai, + .modes = es7154_modes, + .mode_num = ARRAY_SIZE(es7154_modes), + .extra_routes = es7154_extra_routes, + .extra_route_num = ARRAY_SIZE(es7154_extra_routes), + .extra_widgets = es7154_extra_widgets, + .extra_widget_num = ARRAY_SIZE(es7154_extra_widgets), +}; + static int es7134_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -245,13 +302,14 @@ static int es7134_probe(struct platform_device *pdev) return devm_snd_soc_register_component(&pdev->dev, &es7134_component_driver, - &es7134_dai, 1); + priv->chip->dai_drv, 1); } #ifdef CONFIG_OF static const struct of_device_id es7134_ids[] = { { .compatible = "everest,es7134", .data = &es7134_chip }, { .compatible = "everest,es7144", .data = &es7134_chip }, + { .compatible = "everest,es7154", .data = &es7154_chip }, { } }; MODULE_DEVICE_TABLE(of, es7134_ids);