From patchwork Tue Dec 4 08:02:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10711253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A55AE13AF for ; Tue, 4 Dec 2018 08:02:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 914952A947 for ; Tue, 4 Dec 2018 08:02:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 818D72A959; Tue, 4 Dec 2018 08:02:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA3E12A947 for ; Tue, 4 Dec 2018 08:02:57 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6C125267B31; Tue, 4 Dec 2018 09:02:56 +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 DD8A6267B37; Tue, 4 Dec 2018 09:02:53 +0100 (CET) Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-eopbgr1410095.outbound.protection.outlook.com [40.107.141.95]) by alsa0.perex.cz (Postfix) with ESMTP id 61B6826789B for ; Tue, 4 Dec 2018 09:02:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F2NlDtZBIHLQ3aJAtaf8h7YFlUaOYbgbpOsB2EeJ8CA=; b=Hlpn70Scbx9nCY+8ru6CfG/upeabSsW2fpCuwtcHX6/T1mHja9JFnhe+CYhhC5grnGB0CvKri1+T+HdWpspWTixijo7G0MCMD7CzVMf1Jju2Brzt6zaCzkSwkgHH9C1JOpzTmJrv3F1JvFcqRUC3BL1rjEozRjovfoKVdx471Xg= Received: from TYAPR01MB3661.jpnprd01.prod.outlook.com (20.178.137.210) by TYAPR01MB2560.jpnprd01.prod.outlook.com (20.177.104.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17; Tue, 4 Dec 2018 08:02:43 +0000 Received: from TYAPR01MB3661.jpnprd01.prod.outlook.com ([fe80::70b6:5ef2:3f71:77c7]) by TYAPR01MB3661.jpnprd01.prod.outlook.com ([fe80::70b6:5ef2:3f71:77c7%4]) with mapi id 15.20.1382.020; Tue, 4 Dec 2018 08:02:43 +0000 From: Kuninori Morimoto To: Mark Brown Thread-Topic: [PATCH] ASoC: rsnd: add missing TDM Split mode support for simple-card Thread-Index: AQHUi6e8oIhrFGRgf0qS+yp/Ze+7wQ== Date: Tue, 4 Dec 2018 08:02:43 +0000 Message-ID: <87h8ft3ezh.wl-kuninori.morimoto.gx@renesas.com> Accept-Language: ja-JP, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: TYAPR01CA0166.jpnprd01.prod.outlook.com (2603:1096:404:7e::34) To TYAPR01MB3661.jpnprd01.prod.outlook.com (2603:1096:404:c1::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [211.11.155.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; TYAPR01MB2560; 20:UVuUF3MALTxw3QB49mRQAvU8YLuI7otiCvHDEURB5yrxB7wqiPwJRLuvBW45AyxLNGgkGSi7Sa4jPoSumiZ/XneHclUn+IDiGdIxib94SAYDr3yMeeOtden7X2vMl7bci/iwWEBv0Ts05cInVvI9gri+9i2ZQkIGB1Ul+LpjZ1E= x-ms-office365-filtering-correlation-id: 41f8f626-465a-4db0-c275-08d659bede73 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:TYAPR01MB2560; x-ms-traffictypediagnostic: TYAPR01MB2560: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231455)(999002)(944501493)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:TYAPR01MB2560; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB2560; x-forefront-prvs: 0876988AF0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(366004)(39860400002)(346002)(376002)(189003)(199004)(86362001)(71190400001)(66066001)(68736007)(5660300001)(71200400001)(52116002)(2616005)(99286004)(97736004)(6436002)(14454004)(476003)(6916009)(486006)(6486002)(102836004)(478600001)(106356001)(81156014)(81166006)(316002)(36756003)(305945005)(8936002)(6512007)(25786009)(105586002)(8676002)(3846002)(6116002)(4326008)(256004)(2906002)(53936002)(26005)(186003)(7736002)(386003)(6506007); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB2560; H:TYAPR01MB3661.jpnprd01.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: c8h6n3OTY0OcpurbyzdgNAHQABKEq2Zbba3izIbOpVzonSJB6KOaxGxpqYUufcXgVvtk+FwwlXqfCQ3AWODRK7kjftswKeckyA5ZpC4FSxuiJyjkAoPGynhqMzjuqF347pTj06v4X+6VBn9yUPtaFyfBQswOkQlSQYpV0JDxxsGKYpDsc8UFdvPN5fnnWankiL8ENzDe/mEjKYF9t8eV4BKaQlXXwgJEjDKZTtwGzIHJmXIJNxvCWMpYl5W1DgXZtnIb7PNOo0g8D64jVWg/JL6MEybxRTjs1rSO9VoK1WHOY12QJBkYVZbEPYj8atnxbkLq91xLOSpCafDbJhEMQAjR6ovZZq9kgT50sq9O6C0= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41f8f626-465a-4db0-c275-08d659bede73 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2018 08:02:43.3262 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2560 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH] ASoC: rsnd: add missing TDM Split mode support for simple-card 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 commit f69f452243e4e1 ("ASoC: rsnd: add TDM Split mode support") added TDM Split mode support for rsnd driver. But, it cares audio-graph-card style only. We can't use TDM Split mode on simple-card style now. This patch fixup this issue. Fixes: f69f452243e4e1 ("ASoC: rsnd: add TDM Split mode support") Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 031cd5b..59e250c 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1031,6 +1031,49 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { .prepare = rsnd_soc_dai_prepare, }; +static void rsnd_parse_connect_simple(struct rsnd_priv *priv, + struct device_node *dai_np, + int dai_i, int is_play) +{ + struct device *dev = rsnd_priv_to_dev(priv); + struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i); + struct rsnd_dai_stream *io = is_play ? + &rdai->playback : + &rdai->capture; + struct device_node *ssiu_np = rsnd_ssiu_of_node(priv); + struct device_node *np; + int i, j; + + if (!ssiu_np) + return; + + if (!rsnd_io_to_mod_ssi(io)) + return; + + /* + * This driver assumes that it is TDM Split mode + * if it includes ssiu node + */ + for (i = 0;; i++) { + struct device_node *node = is_play ? + of_parse_phandle(dai_np, "playback", i) : + of_parse_phandle(dai_np, "capture", i); + + if (!node) + break; + + j = 0; + for_each_child_of_node(ssiu_np, np) { + if (np == node) { + rsnd_flags_set(io, RSND_STREAM_TDM_SPLIT); + dev_dbg(dev, "%s is part of TDM Split\n", io->name); + } + j++; + } + + } +} + static void rsnd_parse_connect_graph(struct rsnd_priv *priv, struct rsnd_dai_stream *io, struct device_node *endpoint) @@ -1246,8 +1289,14 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) dai_i++; } } else { - for_each_child_of_node(dai_node, dai_np) - __rsnd_dai_probe(priv, dai_np, dai_i++); + for_each_child_of_node(dai_node, dai_np) { + __rsnd_dai_probe(priv, dai_np, dai_i); + if (rsnd_is_gen3(priv)) { + rsnd_parse_connect_simple(priv, dai_np, dai_i, 1); + rsnd_parse_connect_simple(priv, dai_np, dai_i, 0); + } + dai_i++; + } } return 0;