From patchwork Thu Dec 17 02:48:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7868451 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5678B9F387 for ; Thu, 17 Dec 2015 02:48:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87D46203E6 for ; Thu, 17 Dec 2015 02:48:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4C0E020211 for ; Thu, 17 Dec 2015 02:48:48 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 57BDA265E40; Thu, 17 Dec 2015 03:48:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 256A2265CBA; Thu, 17 Dec 2015 03:48:39 +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 2CB20265D42; Thu, 17 Dec 2015 03:48:38 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id C739A265B90 for ; Thu, 17 Dec 2015 03:48:29 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 17 Dec 2015 11:48:27 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 8C67044F12; Thu, 17 Dec 2015 11:48:27 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 7218E1806F; Thu, 17 Dec 2015 11:48:27 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 6AA131800A; Thu, 17 Dec 2015 11:48:27 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id MAD18883; Thu, 17 Dec 2015 11:48:27 +0900 X-IronPort-AV: E=Sophos;i="5.20,438,1444662000"; d="scan'";a="201978047" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 17 Dec 2015 11:48:26 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1015.apcprd06.prod.outlook.com (10.161.180.156) with Microsoft SMTP Server (TLS) id 15.1.361.13; Thu, 17 Dec 2015 02:48:23 +0000 Message-ID: <87io3xiyid.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown Date: Thu, 17 Dec 2015 02:48:23 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0004.apcprd02.prod.outlook.com (25.164.90.142) To HKXPR06MB1015.apcprd06.prod.outlook.com (25.161.180.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1015; 2:kLeUcPd+07YnHVwqZMY0twsA/UQ0Tz/JMuS4GLTI8b25wjaA3wiQ3DHepWCCGIeuY8pVpY7NAegQm9RhcyEprwdmkqgnf+aSGQRpqhUXaA28h8Rt10vUziCpD6/bWW4gOuHaAuNS+MtD89DnXn7zRA==; 3:vBqPCdKcN1F75XoCXkJEW2+Gy2kWPfQL2KIc/71OEyAoml8x2a5PdNd+UCWevYnoDZX+/rWMz2Vs+mBi8Grx/XxMNLaWe0gCgoqNaBC653eCOlClat8NIk2xtIQNTiur; 25:662FaTbL36E8xFhnpq1EjGMXJW5ogG2VTt7Idu7PskcvWWzOj0xZ9j4lwPOYqpibOga/SPt3FSAokO5vIPM7JwCTD7xxiLmeESqh8Rv8WGjbnqONBl/muPH6Mr7WcRuRVepssSs5Q1oLBo8cNDtqbgEYM649wExwPB8lITEK8/b0AOujKOOnItVmyOSY7kf2SvpAN82S3xI0xvTl/q+STr7UfYCWYvdu4o17jPI0+8na1Fq7Xh6wAp6+gSCz6kYe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1015; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1015; 20:ZJDXDwqnT53GpMVDBdtHoyVuUo9LqzupNw0geXh5u2PvBZsqVC+HSUU5jTnqTfkgJG96Zrs0qWk0YcEjUTt4exC59YQRiS9tdJlngtEXZOoSrQOCbd6Xs+GSZHl/wBIUWuPen7PO3RYY574kzNZOxCjP/DfxK4sGZblG9Z1RqelDocd1B9Usl3tv9DDnqO56uJwGV4bCaWwrEbxxG/dwnxvsMAArSDSIHRAb3Vj/VlDYvIZeAzq/FxzX7VqGfeJcsFVOng1+IC6uo2a0w8EqqzVSI5GYuOs93PbfSewWc9PJGBmEUqRO9qRSzqGuf6aeV/d28VW5Rz/YmiJ4hqUgKqsAu2yyVBezUhkMJTRBxgP7U9xwMPH1apmS4cCPFfKnOjxltUWP6x+Y5ZUggywyOv+wFZpR1DjzUvxGxovJmtVlBxW9T1UdYOXOHQqkMCUyHOV896j/xegLCbEPaHw61q7z+Zl6mQinjV1j7VJbmTqb18GdKw7N+bEopZsPqD3X; 4:vdMO4F5ojalPilTnIqnzlo/xE6c1kBV3SLxl+06aLXuBDiP/TjpLs1FzA11kYjxfbRSTf/Nch+YlNp/2TRvLEGRqzzrQDFmmQQDMLWRBgNq9/yOqwGJZ9rC0zwV3eiXMUMcn9XE9+UXSACkg7Nb32ow5WbSOQdjzEeyFxkei2FH6IXYPpI6VrDa/uMmgV4U1MZ3NXEwK83UCLWj+cN+91z7xCO0YqL0+66+cgAs/iAiN8xmbsKMaZ1ewvx3jet3IyWD9/rEybhjAmcH/sUCLlryhzj2rOgZLQpYtrTxFd6On6O7iJXUscvib1UKF7yhoMRNmEMu3cQO4cCI7k3MKlxKyqTak8p0zrH9paWbjRifUK1GMiHww92VQhjCE9/A1/jfMlaEqCL6xtufrOkeQasqpAx4/xoz1nTXp4KVdGCk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001); SRVR:HKXPR06MB1015; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1015; X-Forefront-PRVS: 07935ACF08 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(101416001)(105586002)(54356999)(50466002)(5008740100001)(46406003)(189998001)(5001960100002)(19580405001)(110136002)(229853001)(36756003)(5004730100002)(92566002)(42186005)(33646002)(86362001)(122386002)(19580395003)(77096005)(83506001)(586003)(1096002)(23726003)(81156007)(3846002)(4001350100001)(50986999)(66066001)(6116002)(97736004)(69596002)(40100003)(87976001)(47776003)(53416004)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1015; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1015; 23:6pd07NkHRwtPuv53B/rmtnJHah4Jb4hWhps81s/X7?= =?us-ascii?Q?iTyfs/CQWIoghvuUqNCxv/jXsMIICSsqrOw+s7+RaT+kcwNgHoSanIKXMqIw?= =?us-ascii?Q?SdORWlM0jGqc4h0RVteKaYmV7dF4ROizGUjMp/m5l3vBEyv4TzvfcV1isbVf?= =?us-ascii?Q?neOR9UE4aruaIia0r/V3xyYBVwX2Wp5oM6fdXFMtuBOQTJVJsWc8s0fmb+gB?= =?us-ascii?Q?hiDVKR1xj7Cs5gJFaNWZQcgFLdIMHsCBppz3MG16QoRH1ERbVB9ozceT9gI0?= =?us-ascii?Q?xbwtmGWUMyWquR3/waOW4brXMiGyBsoSt93TjEfrfiWIHsNgDzNPRV5MjTpY?= =?us-ascii?Q?mtRkEeBJlcGeX9OLowjDw8xR62uK0WuhksJBvL1NmRJN7IGzIL1k7L/BAByF?= =?us-ascii?Q?Lvq/QAVUZ4JzVgamZJVCuK3gXu9kg3eoyVSId9bdgAsMsIa5CfZZSbNZSn9b?= =?us-ascii?Q?Jl+TfZYryK8nzgECi1WRh82G4nkdPNh1iLQsfJliKcKpu0kvcRLFGRHJYL/9?= =?us-ascii?Q?DkpHs7zcKSfXXmX2B98txfkCJoVkHbBA7bvfOzacHP3VGIRq2f785/tntWHM?= =?us-ascii?Q?iUNVLskSFV/LYQ2n65or1QfVtgS5gv03Kt0T+aLlQNPfM3uUxHigdhF9C/+b?= =?us-ascii?Q?7+GdvfEnlEyL2yazZsVhkDuLG5pijxKl6CWbYqv9rgjA7JviTr0si3R0S2m/?= =?us-ascii?Q?Ighc6xiGp4WcaqLsCguc47QQMrx8lGsOmK4bzJmJI2PohOy2nI4mKvLdxeZL?= =?us-ascii?Q?BelSEy4s4mWSTI8t/Qc3Hl7t9WtyB/S3lcSaejTgwd1e0FSjZ6UQjmJ63IfW?= =?us-ascii?Q?m/LwH5CzsbXW+SR3uFNxDC0AyOFNrT4ijfAvqRERIn59zpXKmDbj6ar5lWFx?= =?us-ascii?Q?n53q0iqrwXYxd87HtdTIHaUQf9VvxKxZdQXo46yAQ0RdCdY82vUpV4nrwT4z?= =?us-ascii?Q?uNHTDh2dHHbI/n4YNGYFTPPSZgmOzwATW6wVL1PIC+mmJBcBuDtrPYmDVzB7?= =?us-ascii?Q?LyIda8dHP246F2ecX4zVhpB65BtelYPdaRC63V65MXDTt5T2IVFIQX+ifSEa?= =?us-ascii?Q?TPDMMY=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1015; 5:m32mDrTGN2rMUd34RQaq5flzCfB+y1lM97E7kq35b6Iye0inBeXnJX/fjqTWqOUYDa9iK1ZU0bj0Eo75mlDfxZWnrQpX+9m3ddAOKzdD3LxwsZx814FtQVQ4G2dZz54kfSu8Zew5tcZI3mgN8VG86w==; 24:DCuaNtejbOtwuNNIFufeRfsQ9Agkd2wmSmg0nF2Ecniu1ykuKRi7QaqXEXkrz8WT86IPkZd0kGDAMz+JGiQDdz9y480rcSeOaCZuiZIrSDc=; 20:sCMuUqHDOrQFFuwEwygggZG8Nuam1I9ZvsHwgLiwNA2qCMhlvue7BMj3Tw0e3PUQb7Ht/lAEL2izCOaNebBcIdm326SzMgic/SKtn7RdxVt7nuNVZum0Huj8NTykjfMTNKSN6iwRNdMA/KTceiMUHV4x8KdBWKXPDhO3cmWR1q4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2015 02:48:23.6831 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1015 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: rsrc-card: enable to use tdm_slot on DT 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Renesas sound driver will use tdm slot on TDM Multi Mode support. This patch enables tdm slot on rsrc card driver on DT. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsrc-card.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index a3ec13f..3c308e2 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -50,6 +50,10 @@ MODULE_DEVICE_TABLE(of, rsrc_card_of_match); struct rsrc_card_dai { unsigned int fmt; unsigned int sysclk; + unsigned int tx_slot_mask; + unsigned int rx_slot_mask; + int slots; + int slot_width; struct clk *clk; char dai_name[DAI_NAME_NUM]; }; @@ -126,6 +130,18 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) } } + if (dai_props->slots) { + ret = snd_soc_dai_set_tdm_slot(dai, + dai_props->tx_slot_mask, + dai_props->rx_slot_mask, + dai_props->slots, + dai_props->slot_width); + if (ret && ret != -ENOTSUPP) { + dev_err(dai->dev, "set_tdm_slot error\n"); + goto err; + } + } + ret = 0; err: @@ -198,6 +214,15 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret) return ret; + /* Parse TDM slot */ + ret = snd_soc_of_parse_tdm_slot(np, + &dai_props->tx_slot_mask, + &dai_props->rx_slot_mask, + &dai_props->slots, + &dai_props->slot_width); + if (ret) + return ret; + if (is_fe) { /* BE is dummy */ dai_link->codec_of_node = NULL;