From patchwork Thu Nov 22 00:57:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10693355 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 3BCB814BD for ; Thu, 22 Nov 2018 00:57:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21B162C5BD for ; Thu, 22 Nov 2018 00:57:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 132F72C697; Thu, 22 Nov 2018 00:57:18 +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 57F7B2C5BD for ; Thu, 22 Nov 2018 00:57:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 59FE12677E8; Thu, 22 Nov 2018 01:57:16 +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 0D0DC267A90; Thu, 22 Nov 2018 01:57:14 +0100 (CET) Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-eopbgr1400094.outbound.protection.outlook.com [40.107.140.94]) by alsa0.perex.cz (Postfix) with ESMTP id D69F72677E8 for ; Thu, 22 Nov 2018 01:57:11 +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=R5AQtWJTeDFBwfOdc9AL+Ftt0FyykZts8aE9hehgdpM=; b=ECCD9YrGPye2m0e3CtXHGWsQ7eOtQLeVC71OAA8VIP9RyySIAGK4dZdha9jjjBTqkjT3VHiuLfvgw39RtAmITE5FGfEzs+N3YLP4vppgBAbmsXUD4tKgO1CbJ7f9es5DetK4SQO0XSgiIcV7Xj2KlrNqiAhLTy5vnSBFXohXWUs= Received: from TYAPR01MB3328.jpnprd01.prod.outlook.com (20.178.136.81) by TYAPR01MB3231.jpnprd01.prod.outlook.com (20.177.103.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Thu, 22 Nov 2018 00:57:09 +0000 Received: from TYAPR01MB3328.jpnprd01.prod.outlook.com ([fe80::19d4:7f22:a842:9f67]) by TYAPR01MB3328.jpnprd01.prod.outlook.com ([fe80::19d4:7f22:a842:9f67%4]) with mapi id 15.20.1339.027; Thu, 22 Nov 2018 00:57:09 +0000 From: Kuninori Morimoto To: Mark Brown Thread-Topic: [PATCH 08/10] ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing Thread-Index: AQHUgf5LdRXanAD14kun2XGRIAGPSw== Date: Thu, 22 Nov 2018 00:57:09 +0000 Message-ID: <87pnuylyyv.wl-kuninori.morimoto.gx@renesas.com> References: <871s7endnu.wl-kuninori.morimoto.gx@renesas.com> In-Reply-To: <871s7endnu.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: TY2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:404:56::17) To TYAPR01MB3328.jpnprd01.prod.outlook.com (2603:1096:404:bb::17) 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; TYAPR01MB3231; 20:dkmuX+4/bfhYxrDFGNjzC8mr4dtfziDqgK08p7Y0qTV5H0niXxndGoq38pNDeY0OCpkPAPMmcGXXZQlB7dmQT5eZOFFU78D7phf7netTJlEUg9zt+IYdFSjMKPDVIQ6X55j1Z44pdKwW4r2+r7PXLnBQTCx8q/3dAyfeO0NltcE= x-ms-office365-filtering-correlation-id: 5dd3ca46-d87a-461e-3485-08d650156e1b 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:TYAPR01MB3231; x-ms-traffictypediagnostic: TYAPR01MB3231: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231442)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:TYAPR01MB3231; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB3231; x-forefront-prvs: 0864A36BBF x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(39850400004)(396003)(136003)(366004)(189003)(199004)(53936002)(6512007)(316002)(36756003)(305945005)(26005)(5660300001)(52116002)(386003)(6506007)(2906002)(102836004)(71200400001)(71190400001)(7736002)(6486002)(25786009)(6916009)(68736007)(3846002)(6116002)(4326008)(99286004)(6436002)(2900100001)(446003)(97736004)(486006)(11346002)(476003)(478600001)(86362001)(8676002)(66066001)(14454004)(2616005)(76176011)(186003)(106356001)(81156014)(81166006)(8936002)(256004)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB3231; H:TYAPR01MB3328.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: /KSUXnNpQER/gveL9jyfj7KW39o8iVWB5/Z8vqNqZBv7nXDyDWtFJXRDHGI7APgIUPKulDWVPOq/ZHqBAFOHwcsm0/YCVkvoLAIJ9p2k7SCMzsDqRZqzR28D6XS1vl3/Jwbg2mWXHTVPdoWwFKM2kh/7fTwxJK41NzTvJvrP0DodRrBq9kwe8CpOVpTX5TVwmg6XsOkgc0SkQbBfz11VYqYcQObu0/3LB/feToikzEzz5nt1jbo138HCH696iJhnX2q1QhzXhd8w/8RLdFcvMWNJUyVAcKe4bPqT8F5Y1c5eE1tC4Dr5Br4x9VmsEkri0ptkpy3IQE8orVqX7gIxscgE7lT/ixnIb/bEUQ8Qhno= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <7591B1A3B72F9D439EB787BC4C860AC9@jpnprd01.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dd3ca46-d87a-461e-3485-08d650156e1b X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Nov 2018 00:57:09.2456 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB3231 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 08/10] ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing 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 Current audio-graph-scu-card driver is parsing codec position for DPCM and consider DAI format. But, current operation is doing totally pointless, because 1) asoc_simple_card_parse_daifmt() will be called not only for 1st codec on current implementation, and it will be used as fixed format 2) it should be called for each CPU/Codec pair. Let's tidyup asoc_simple_card_parse_daifmt() timing. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-scu-card.c | 54 ++++++++++---------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index 0f13f11..ce1f108 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -96,15 +96,16 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -static int asoc_graph_card_dai_link_of(struct device_node *ep, +static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep, + struct device_node *codec_ep, struct graph_card_data *priv, - unsigned int daifmt, int idx, int is_fe) { struct device *dev = graph_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, idx); struct graph_dai_props *dai_props = graph_priv_to_props(priv, idx); struct snd_soc_card *card = graph_priv_to_card(priv); + struct device_node *ep = is_fe ? cpu_ep : codec_ep; struct device_node *node = of_graph_get_port_parent(ep); int ret; @@ -185,7 +186,11 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, if (ret < 0) return ret; - dai_link->dai_fmt = daifmt; + ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, + NULL, &dai_link->dai_fmt); + if (ret < 0) + return ret; + dai_link->dpcm_playback = 1; dai_link->dpcm_capture = 1; dai_link->ops = &asoc_graph_card_ops; @@ -205,7 +210,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) struct device_node *codec_ep; struct device_node *codec_port; struct device_node *codec_port_old; - unsigned int daifmt = 0; int dai_idx, ret; int rc, codec; @@ -228,26 +232,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) * see asoc_graph_get_dais_count */ - /* find 1st codec */ - of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { - cpu_port = it.node; - cpu_ep = of_get_next_child(cpu_port, NULL); - codec_ep = of_graph_get_remote_endpoint(cpu_ep); - - of_node_put(cpu_ep); - of_node_put(codec_ep); - - if (!codec_ep) - continue; - - ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, - NULL, &daifmt); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } - } - dai_idx = 0; codec_port_old = NULL; for (codec = 0; codec < 2; codec++) { @@ -264,28 +248,22 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) of_node_put(cpu_ep); of_node_put(codec_ep); + of_node_put(cpu_port); of_node_put(codec_port); + it.node = NULL; if (codec) { if (codec_port_old == codec_port) continue; codec_port_old = codec_port; - - /* Back-End (= Codec) */ - ret = asoc_graph_card_dai_link_of(codec_ep, priv, daifmt, dai_idx++, 0); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } - } else { - /* Front-End (= CPU) */ - ret = asoc_graph_card_dai_link_of(cpu_ep, priv, daifmt, dai_idx++, 1); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } } + + ret = asoc_graph_card_dai_link_of(cpu_ep, codec_ep, + priv, dai_idx++, + !codec); + if (ret < 0) + goto parse_of_err; } }