From patchwork Thu Nov 22 00:55: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: 10693341 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 00FED14BD for ; Thu, 22 Nov 2018 00:55:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBD202C5DF for ; Thu, 22 Nov 2018 00:55:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA3AF2C5BD; Thu, 22 Nov 2018 00:55:17 +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 1D8F72C5BD for ; Thu, 22 Nov 2018 00:55:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 11E2C267929; Thu, 22 Nov 2018 01:55: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 757EE267929; Thu, 22 Nov 2018 01:55:14 +0100 (CET) Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-eopbgr1410129.outbound.protection.outlook.com [40.107.141.129]) by alsa0.perex.cz (Postfix) with ESMTP id 534D426770D for ; Thu, 22 Nov 2018 01:55:12 +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=SOuuzYVzthI+LShPhKMZ6vqrVnB7enF1wx13Muucdwo=; b=Sgpwgq4un7SlZAgBXuHbbRQPmAj7zTP0YrxrmoHEp7t9u9SzJNEprXdtn1rKhJXM0hBfbZ6ZUDz2xC0wfpCPBCNhMjh91tDUda7PljcIYDQ51anrGp26bykINEeTCSDU0Re+ym0V1oNdVW+Af96OUI4WD3xqKRoYNGirQ4fkYFQ= Received: from TYAPR01MB3328.jpnprd01.prod.outlook.com (20.178.136.81) by TYAPR01MB2093.jpnprd01.prod.outlook.com (52.133.180.13) 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:55: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:55:09 +0000 From: Kuninori Morimoto To: Mark Brown Thread-Topic: [PATCH 01/10] ASoC: soc-core: add snd_soc_of_parse_node_prefix() Thread-Index: AQHUgf4EdFnDtEmLek6/R4pSG87Ehg== Date: Thu, 22 Nov 2018 00:55:09 +0000 Message-ID: <87zhu2lz26.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: KAXPR01CA0003.jpnprd01.prod.outlook.com (2603:1096:402:19::13) 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; TYAPR01MB2093; 20:F0lBxYkmAExVj9iBUcxyM38mgFYiRMQpNf6zBtxOXJap6ptpgoPgoYO0m3zlWfZTG4dYmc8fkxt/kJyg4xt7MWq4WTU8TWEsGXXMwEKTG2dGgQXSRAeDqRVi8QJNksNMEYC2pxKsqj+u8vH2vV/H8rOjwvZ5rph7LIXlkc3MQ6Q= x-ms-office365-filtering-correlation-id: 74b9dba4-73d6-4316-80ce-08d65015268e 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:TYAPR01MB2093; x-ms-traffictypediagnostic: TYAPR01MB2093: 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)(8121501046)(5005006)(3002001)(10201501046)(3231442)(944501410)(52105112)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:TYAPR01MB2093; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB2093; x-forefront-prvs: 0864A36BBF x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(376002)(396003)(346002)(199004)(189003)(5660300001)(256004)(186003)(2900100001)(14454004)(7736002)(4326008)(316002)(305945005)(2616005)(446003)(11346002)(71190400001)(71200400001)(6916009)(102836004)(476003)(97736004)(36756003)(26005)(8936002)(8676002)(76176011)(86362001)(3846002)(6116002)(66066001)(486006)(6486002)(81156014)(81166006)(6506007)(386003)(52116002)(99286004)(478600001)(6512007)(25786009)(68736007)(6436002)(53936002)(2906002)(105586002)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB2093; H:TYAPR01MB3328.jpnprd01.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: KkO7PaQs8magoD/XI42CdZ/v3howGEOUeuoKbm0iMZ5xe7NxXVk/mPhOet2ueT17jMjfxEp0Rd9PSGWAezV2V2KdL1skBdmUJ8um41pds7rOL9g9kbgKtHrQhlShtX2ktzvqIFiXVxiWL0faLLKmbcvuAML0e8C4EABnR0Wnnxobbq+NhvkMnFO+SQuo1Tbtulzb+ZqLOH5YXUpFKDWIaKcC+jJz6ou0llavNjjk5B2z0nxQvyljR8TPMgm3Qb0P0dMfJGM1AdHAJZVx/rV0kd590pCqN4gKqEdZrvMBHiWYgyqaVxfigzRPzk+hqoy5yQ72vJS8ckAXfyuQs8GtPE9SBAHmihyuYzgWzYe90Fc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74b9dba4-73d6-4316-80ce-08d65015268e X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Nov 2018 00:55:09.2503 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2093 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 01/10] ASoC: soc-core: add snd_soc_of_parse_node_prefix() 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 ASoC has snd_soc_of_parse_audio_prefix() to get codec_conf settings from DT which is used to avoid DAI naming conflict when CPU/Codec matching. Currently, it is parsing from "top node", but, we want to parse from "each sub node" if sound card had multi cpus/codecs. This patch adds new snd_soc_of_parse_node_prefix() to allow parsing settings from selected node. It is keeping existing snd_soc_of_parse_audio_prefix() by using macro. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 6 +++++- sound/soc/soc-core.c | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 5a8b841..93b7510 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1477,10 +1477,14 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, unsigned int *rx_mask, unsigned int *slots, unsigned int *slot_width); -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, +void snd_soc_of_parse_node_prefix(struct device_node *np, struct snd_soc_codec_conf *codec_conf, struct device_node *of_node, const char *propname); +#define snd_soc_of_parse_audio_prefix(card, conf, node, name) \ + snd_soc_of_parse_node_prefix((card)->dev->of_node, \ + (conf), (node), (name)) + int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname); unsigned int snd_soc_of_parse_daifmt(struct device_node *np, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6ddcf12..012000d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3484,12 +3484,11 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, } EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot); -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, - struct snd_soc_codec_conf *codec_conf, - struct device_node *of_node, - const char *propname) +void snd_soc_of_parse_node_prefix(struct device_node *np, + struct snd_soc_codec_conf *codec_conf, + struct device_node *of_node, + const char *propname) { - struct device_node *np = card->dev->of_node; const char *str; int ret; @@ -3502,7 +3501,7 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, codec_conf->of_node = of_node; codec_conf->name_prefix = str; } -EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix); +EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix); int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname)