From patchwork Tue Dec 4 08:20:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10711477 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 3F46A17D5 for ; Tue, 4 Dec 2018 10:47:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 317592AC49 for ; Tue, 4 Dec 2018 10:47:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 257A02ABE4; Tue, 4 Dec 2018 10:47:48 +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 EDF572AB15 for ; Tue, 4 Dec 2018 10:47:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 628CC267B58; Tue, 4 Dec 2018 09:20:33 +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 14B6B267B59; Tue, 4 Dec 2018 09:20:31 +0100 (CET) Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-eopbgr1400123.outbound.protection.outlook.com [40.107.140.123]) by alsa0.perex.cz (Postfix) with ESMTP id CEA09267B37 for ; Tue, 4 Dec 2018 09:20:28 +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=WAvOA6jPzeAaDgB29N+mLjJbLxrDgVggsWu8nPqD+oQ=; b=ADgSRUvMhZsmYylsfqr/WSf550yYQ017C7pKa9ipr0pZ8MBGr2sLVD770da07swKqwZlk2ry/kgEpXQEPfGwBizgALJmKz+HgeWJyiElDQ65pziDjZQ/7Ab31whcvSZEUGaSQkYSy/svZaVGH1s4Q+CXrFRSt2lJOxAMkDSkWGU= Received: from TYAPR01MB3661.jpnprd01.prod.outlook.com (20.178.137.210) by TYAPR01MB1918.jpnprd01.prod.outlook.com (52.133.176.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Tue, 4 Dec 2018 08:20:26 +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:20:26 +0000 From: Kuninori Morimoto To: Mark Brown Thread-Topic: [PATCH 3/7] ASoC: simple-scu-card: add dai-link support Thread-Index: AQHUi6o1dz5AIw2cpk+YHcvNLaZ2cA== Date: Tue, 4 Dec 2018 08:20:26 +0000 Message-ID: <87a7ll3e5y.wl-kuninori.morimoto.gx@renesas.com> References: <87efax3e85.wl-kuninori.morimoto.gx@renesas.com> In-Reply-To: <87efax3e85.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: TYAPR01CA0044.jpnprd01.prod.outlook.com (2603:1096:404:28::32) 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; TYAPR01MB1918; 20:IlOKbKh2CxQM9CMNPv+4CHFhpiFVDjM7Z7O/42lYtFKSUdOq3FPo7pXgHM2c+ET/UpVOY51gM1dGjbj/Cu9nkw7HoMEYwTjuMJjtQZFXqKmLecNvz8Aeti/sYexdZBrA1nyXMY26rKlDxVPDESDo3QJE215M8UsIdp3J79dl9Q4= x-ms-office365-filtering-correlation-id: 1afce05f-7d12-465c-1619-08d659c157e9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYAPR01MB1918; x-ms-traffictypediagnostic: TYAPR01MB1918: 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)(3231455)(999002)(944501493)(52105112)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:TYAPR01MB1918; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB1918; x-forefront-prvs: 0876988AF0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(396003)(366004)(376002)(39860400002)(189003)(199004)(5660300001)(81166006)(11346002)(81156014)(106356001)(105586002)(478600001)(2616005)(14454004)(25786009)(2906002)(446003)(6506007)(386003)(86362001)(52116002)(486006)(36756003)(4326008)(8676002)(99286004)(186003)(256004)(66066001)(102836004)(6116002)(3846002)(53936002)(97736004)(305945005)(6916009)(7736002)(76176011)(71200400001)(71190400001)(6512007)(68736007)(476003)(6486002)(8936002)(26005)(6436002)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB1918; 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: x8u93I7raqMbkdHwnfsoFkmEG81FFMHQaPi6VMtljS3KSwewNSmJHJ38xagx0tDVOgiTPDMweF5dAKhWP4Tl7EiGIgZoJHPlQ+J5D3O9rduNp6znNyXmT12kLNd7UavWB5WN/h7SBW2Y5iPdgG4P++Nh1nWiR8gc8e2FTCybiOvRwEOUG6LnrUlBSFNk2GdPHT9PsR3Ki7t5ZxSdsVvIY1GnFnDXLZj6AA5ANRrwUfpSg9EY31J8IEQquZpaZhj1ao1p2TXdPXeIhbQEdUWEkVC3W60b1lM6lWFnRZTazf95BVz3Zh9wnXe7pRnuSBQuM35YGvzoLdH4WrcWk7Ng5lJhaGyLIQ/AQUcT3IGLwnQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <641592CEB9284443A00DCFFAD6E2244C@jpnprd01.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1afce05f-7d12-465c-1619-08d659c157e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2018 08:20:26.0699 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB1918 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 3/7] ASoC: simple-scu-card: add dai-link support 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 simple-card is supporting dai-link support, but simple-scu-card doesn't have it. This patch support it. This is prepare for merging simple-card and simple-scu-card. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-scu-card.c | 46 ++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 77c1efb..666ace6 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -202,14 +202,15 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) { struct device *dev = simple_priv_to_dev(priv); - struct device_node *node = dev->of_node; + struct device_node *top = dev->of_node; + struct device_node *node; struct device_node *np; struct device_node *codec; struct snd_soc_card *card = simple_priv_to_card(priv); bool is_fe; - int ret, i; + int ret, i, loop; - if (!node) + if (!top) return -EINVAL; ret = asoc_simple_card_of_parse_widgets(card, PREFIX); @@ -220,25 +221,34 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) if (ret < 0) return ret; - asoc_simple_card_parse_convert(dev, node, PREFIX, &priv->adata); + asoc_simple_card_parse_convert(dev, top, PREFIX, &priv->adata); + loop = 1; i = 0; - codec = of_get_child_by_name(node, PREFIX "codec"); - if (!codec) - return -ENODEV; - - for_each_child_of_node(node, np) { - is_fe = false; - if (strcmp(np->name, PREFIX "cpu") == 0) - is_fe = true; - - ret = asoc_simple_card_dai_link_of(node, np, codec, priv, - i, is_fe, true); - if (ret < 0) - return ret; - i++; + node = of_get_child_by_name(top, PREFIX "dai-link"); + if (!node) { + node = dev->of_node; + loop = 0; } + do { + codec = of_get_child_by_name(node, + loop ? "codec" : PREFIX "codec"); + if (!codec) + return -ENODEV; + + for_each_child_of_node(node, np) { + is_fe = (np != codec); + + ret = asoc_simple_card_dai_link_of(node, np, codec, priv, + i, is_fe, !loop); + if (ret < 0) + return ret; + i++; + } + node = of_get_next_child(top, node); + } while (loop && node); + ret = asoc_simple_card_parse_card_name(card, PREFIX); if (ret < 0) return ret;