From patchwork Mon Dec 2 17:48:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 11269445 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86BCE109A for ; Mon, 2 Dec 2019 17:51:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1B5F020715 for ; Mon, 2 Dec 2019 17:51:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="i54pFu/9"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="Of/kzTfg"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="Of/kzTfg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B5F020715 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=akkea.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 488E71671; Mon, 2 Dec 2019 18:50:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 488E71671 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1575309079; bh=JH1bHL0hZYMtdafFVvOEcgmJICaT1Kon4Ym9dbyAA9E=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=i54pFu/96BQuPKPlD/N+c4ucugIyeIY4c96PsE08j+d+VZ9bYAZbHdIzv0lgY7ZaX 3ajdgtK0fH0q80usLU5rNRgUj03USyrLTG7qKjdbweetzTwT0SGLhFeNUSYECt6ZES eQryJnM46cW9YCofnjRcCW7hXZPqbzvH5QK3+hR8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 703E3F8023F; Mon, 2 Dec 2019 18:48:49 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 555C6F8021D; Mon, 2 Dec 2019 18:48:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from node.akkea.ca (node.akkea.ca [192.155.83.177]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D3221F801D9 for ; Mon, 2 Dec 2019 18:48:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D3221F801D9 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="Of/kzTfg"; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="Of/kzTfg" Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id AB3454E201A; Mon, 2 Dec 2019 17:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1575308921; bh=G5vaGCDrjN3o6pi2NVpdKXh0OAe+GAhoowcjoaH2b54=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Of/kzTfgYvw4remviMNGT6ec9GPUDfmztvI21zCw3Yty2/9Zhj0MhTDBj6guJDf6k vn1pJbt3kKR8OaPp9ufsybizx73RazGUnF3IYFs4bJ26PH/SS7Zu8rHjW4ge5L0shz mr2gYYt5B+Q6Tsbsl4oqm7l5HT5DVqmdDiBhd8qU= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qiB4KwjmIXlp; Mon, 2 Dec 2019 17:48:41 +0000 (UTC) Received: from thinkpad-tablet.cg.shawcable.net (S0106905851b613e9.cg.shawcable.net [70.77.244.40]) by node.akkea.ca (Postfix) with ESMTPSA id 904B64E2006; Mon, 2 Dec 2019 17:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1575308921; bh=G5vaGCDrjN3o6pi2NVpdKXh0OAe+GAhoowcjoaH2b54=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Of/kzTfgYvw4remviMNGT6ec9GPUDfmztvI21zCw3Yty2/9Zhj0MhTDBj6guJDf6k vn1pJbt3kKR8OaPp9ufsybizx73RazGUnF3IYFs4bJ26PH/SS7Zu8rHjW4ge5L0shz mr2gYYt5B+Q6Tsbsl4oqm7l5HT5DVqmdDiBhd8qU= From: "Angus Ainslie (Purism)" To: kernel@puri.sm Date: Mon, 2 Dec 2019 10:48:30 -0700 Message-Id: <20191202174831.13638-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191202174831.13638-1-angus@akkea.ca> References: <20191202174831.13638-1-angus@akkea.ca> Cc: Mark Rutland , Kate Stewart , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Angus Ainslie \(Purism\)" , Takashi Iwai , Rob Herring , Liam Girdwood , Mark Brown , Thomas Gleixner , Enrico Weigelt , Allison Randal Subject: [alsa-devel] [PATCH 1/2] sound: codecs: gtm601: add Broadmobi bm818 sound profile X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" The Broadmobi bm818 uses stereo sound at 48Khz sample rate Signed-off-by: Angus Ainslie (Purism) --- sound/soc/codecs/gtm601.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/gtm601.c b/sound/soc/codecs/gtm601.c index d454294c8d06..302569bc46ff 100644 --- a/sound/soc/codecs/gtm601.c +++ b/sound/soc/codecs/gtm601.c @@ -37,7 +37,7 @@ static struct snd_soc_dai_driver gtm601_dai = { .channels_max = 1, .rates = SNDRV_PCM_RATE_8000, .formats = SNDRV_PCM_FMTBIT_S16_LE, - }, + }, .capture = { .stream_name = "Capture", .channels_min = 1, @@ -47,6 +47,24 @@ static struct snd_soc_dai_driver gtm601_dai = { }, }; +static struct snd_soc_dai_driver bm818_dai = { + .name = "bm818", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + }, +}; + static const struct snd_soc_component_driver soc_component_dev_gtm601 = { .dapm_widgets = gtm601_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(gtm601_dapm_widgets), @@ -60,13 +78,20 @@ static const struct snd_soc_component_driver soc_component_dev_gtm601 = { static int gtm601_platform_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; + struct snd_soc_dai_driver *dai_driver = >m601_dai; + + if (np && of_device_is_compatible(np, "broadmobi,bm818")) + dai_driver = &bm818_dai; + return devm_snd_soc_register_component(&pdev->dev, - &soc_component_dev_gtm601, >m601_dai, 1); + &soc_component_dev_gtm601, dai_driver, 1); } #if defined(CONFIG_OF) static const struct of_device_id gtm601_codec_of_match[] = { { .compatible = "option,gtm601", }, + { .compatible = "broadmobi,bm818", }, {}, }; MODULE_DEVICE_TABLE(of, gtm601_codec_of_match); From patchwork Mon Dec 2 17:48:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 11269443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 460DB112B for ; Mon, 2 Dec 2019 17:50:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CD69220684 for ; Mon, 2 Dec 2019 17:50:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="kREFLfqi"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="j0V/rYCy"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="j0V/rYCy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD69220684 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=akkea.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0C0FF1665; Mon, 2 Dec 2019 18:49:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C0FF1665 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1575309033; bh=mhtSeAIgqzjxMdBkTFHeQOK35cOb8mj/T5jKfoUXsAI=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kREFLfqisF3XWsIcpGP2MRqkgY3VlhsMUoDZLahcd/er2v49YmXqYPXUZFh5Y7SmE a2NMcyIJl2cgqt+uTA49zC7MvNbcwbTWbX8OnUvCAvNdGw+rP67N19ofWWOoE9u3fj BVYiDv1uslULVEBKKPMUFkTHg2Wof5P38K1weKPI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7AE5CF8021C; Mon, 2 Dec 2019 18:48:48 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 474ABF80216; Mon, 2 Dec 2019 18:48:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,SPF_PASS,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from node.akkea.ca (node.akkea.ca [192.155.83.177]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AF10FF800B4 for ; Mon, 2 Dec 2019 18:48:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AF10FF800B4 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="j0V/rYCy"; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="j0V/rYCy" Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id B62A94E2010; Mon, 2 Dec 2019 17:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1575308922; bh=CpVCZDDbV8uONbAOWgK1IYDM4Mmn8FjXn3PCDH2bR4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0V/rYCy0j9OOJs9b0zzjvCfxNIrV4m4PevJsbWiW6riW7EUmUPZpJtI8WiQnBxug 7kPJUz8JhPc8EBwIxxeT6PwsJDj1AJExVp1droQt7kaEKhG+1C/7VLZljv558EJncH JJTKUrFHh9KmkQAhoQPZeUI2mpYu4MVCdfD0v15Y= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id etR8VgNhfgfP; Mon, 2 Dec 2019 17:48:42 +0000 (UTC) Received: from thinkpad-tablet.cg.shawcable.net (S0106905851b613e9.cg.shawcable.net [70.77.244.40]) by node.akkea.ca (Postfix) with ESMTPSA id 933D74E2003; Mon, 2 Dec 2019 17:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1575308922; bh=CpVCZDDbV8uONbAOWgK1IYDM4Mmn8FjXn3PCDH2bR4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0V/rYCy0j9OOJs9b0zzjvCfxNIrV4m4PevJsbWiW6riW7EUmUPZpJtI8WiQnBxug 7kPJUz8JhPc8EBwIxxeT6PwsJDj1AJExVp1droQt7kaEKhG+1C/7VLZljv558EJncH JJTKUrFHh9KmkQAhoQPZeUI2mpYu4MVCdfD0v15Y= From: "Angus Ainslie (Purism)" To: kernel@puri.sm Date: Mon, 2 Dec 2019 10:48:31 -0700 Message-Id: <20191202174831.13638-3-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191202174831.13638-1-angus@akkea.ca> References: <20191202174831.13638-1-angus@akkea.ca> Cc: Mark Rutland , Kate Stewart , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Angus Ainslie \(Purism\)" , Takashi Iwai , Rob Herring , Liam Girdwood , Mark Brown , Thomas Gleixner , Enrico Weigelt , Allison Randal Subject: [alsa-devel] [PATCH 2/2] ASoC: gtm601: add the broadmobi interface X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" The Broadmobi BM818 uses a different sample rate and channels from the option modem. Signed-off-by: Angus Ainslie (Purism) Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/sound/gtm601.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/gtm601.txt b/Documentation/devicetree/bindings/sound/gtm601.txt index 5efc8c068de0..efa32a486c4a 100644 --- a/Documentation/devicetree/bindings/sound/gtm601.txt +++ b/Documentation/devicetree/bindings/sound/gtm601.txt @@ -1,10 +1,16 @@ GTM601 UMTS modem audio interface CODEC -This device has no configuration interface. Sample rate is fixed - 8kHz. +This device has no configuration interface. The sample rate and channels are +based on the compatible string + "option,gtm601" = 8kHz mono + "broadmobi,bm818" = 48KHz stereo Required properties: - - compatible : "option,gtm601" + - compatible : one of + "option,gtm601" + "broadmobi,bm818" + Example: