From patchwork Thu Mar 25 11:26:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 409574 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52ADAC433DB for ; Thu, 25 Mar 2021 11:35:41 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B04D061A17 for ; Thu, 25 Mar 2021 11:35:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B04D061A17 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1BF7816D2; Thu, 25 Mar 2021 12:34:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1BF7816D2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1616672139; bh=IFoiXAfhradtN6PEcbAsfimedyOWmrcNE7zudXytdCo=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=ph90OnQudJcDAp2aXQ6B4HbBEb9G1axef7EwWrBZ36UEMmd0l0DZdQFAEwI6yyPIK QtO7pT97TEZ1h/WVhdGLbhv4pI/wx7ZMNe4H2ppaZdtL5SHQ2D66fg1CxCbP4SFNhE PLlLYTzizDxPsAtjxGTQBwVOJb4NYSOwKDSITF7c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B0551F80551; Thu, 25 Mar 2021 12:27:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9E69EF8052D; Thu, 25 Mar 2021 12:26:53 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20050.outbound.protection.outlook.com [40.107.2.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2AABDF8052D for ; Thu, 25 Mar 2021 12:26:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2AABDF8052D Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="LgOWPZcd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hbL7hXEs3bb2ouc5OiVXZtY/8pxIMRrD0O/myBZjHrzTaLQyb8Mm7dbwMwsLqbWh2qDZfMpCLBH9itWgT6+geZoJ4oaax3Ylzu+fQFShvHNEOnsc1DI0e4HJAIV/EdBHv7nF2FivGFBwCdAI/4yBfWlSqzXgqnojR2WKJ5YHQWqIul3kOyM42TTgrrn8GYWx57MKPjZBzFDIdzpI9MVCGAQUjxTZFRvh+zxW+jzFGDxNrYb5Urps2/Cj0uL6uXev6ArNEU4pLdICRhO5dGZ7p0AsNUKS5t1zVw07LGeSb+ukHFKeTm01EweXGKS9pd38BLze9rQwFsdAaDGvkoMYRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H3kAqYUEq4uyGtXIjIk9j0olUm4392hcOUA5iNdKVBQ=; b=bKRWFj1hvORYWrZT4h2M03VjR5q7B7cn9Gf+nDufWF6E5SQFfVVsyqttcM00MXha0twT6VydwQe4RB65XCdgmpDEwimCeHx0GgbbTLVlQp290ntsYz15VqRpcuZoivXZUJA8FC80I12g2aNrCo2GVX7R8tkLUtmGZ14Jsqtw3/iTXB/VOih6aNuimEdoWfnCTFKAxNJDv2VxeCW58iBJriJqlI+WjUVmEVjZcfB9vOJzN6VUS6PE3s9CkdpaSkLk1La2nB6E8r8hHW7fsO2oi9YFAULGjDnZkwJpn8+MWrzpkqiZGiER4TmlsCmq75fPs1vFed/nP1tRrscdAx8wbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H3kAqYUEq4uyGtXIjIk9j0olUm4392hcOUA5iNdKVBQ=; b=LgOWPZcdz09oV/f9XI0FE66GR+PEcnkmEguYzkE7QdqXz0JDGMy1tcrmDbyXFGh9lbgMZTiAKJwKLPczaNEWYl0rDLLoRTBc7k4xWOyn8SslA8VcQxZWmnwcNb0zxrKtdNLXzN5GMQtqOjb/8i2VPMkGHZwvoFK0YEM4DuS3ugA= Authentication-Results: alsa-project.org; dkim=none (message not signed) header.d=none;alsa-project.org; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR0401MB2287.eurprd04.prod.outlook.com (2603:10a6:800:2e::19) by VE1PR04MB7232.eurprd04.prod.outlook.com (2603:10a6:800:1af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Thu, 25 Mar 2021 11:26:41 +0000 Received: from VI1PR0401MB2287.eurprd04.prod.outlook.com ([fe80::a841:34f0:bc5c:3764]) by VI1PR0401MB2287.eurprd04.prod.outlook.com ([fe80::a841:34f0:bc5c:3764%2]) with mapi id 15.20.3977.025; Thu, 25 Mar 2021 11:26:41 +0000 From: Daniel Baluta To: alsa-devel@alsa-project.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com Subject: [PATCH v2] ASoC: core: Don't set platform name when of_node is set Date: Thu, 25 Mar 2021 13:26:27 +0200 Message-Id: <20210325112627.275632-1-daniel.baluta@oss.nxp.com> X-Mailer: git-send-email 2.27.0 X-Originating-IP: [86.127.155.38] X-ClientProxiedBy: AM4PR0701CA0041.eurprd07.prod.outlook.com (2603:10a6:200:42::51) To VI1PR0401MB2287.eurprd04.prod.outlook.com (2603:10a6:800:2e::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (86.127.155.38) by AM4PR0701CA0041.eurprd07.prod.outlook.com (2603:10a6:200:42::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.15 via Frontend Transport; Thu, 25 Mar 2021 11:26:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e8aaf26b-aae7-465d-e5ba-08d8ef80dc83 X-MS-TrafficTypeDiagnostic: VE1PR04MB7232: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:478; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j5mOh6sfGs+2Y5cWJpsY6JtRKh4sj59ovJMxfrQvUdkbz/THKTUwubpKouxJJ+/wsVNiOyFRxXQwxXCW++2xc0g2cQAw/0EUlIR9jYRWJolDiX9/tGIqK+/mowIEFAuuGM1fahbb5WrqOLKsxqwGD5omdZhkAyNPFWEIkyHTq3+zAz7bhqmMvEP0LNES7k8LpYi8gEklJGQEZLRyKiO/rQoqfwA7cv9EAuAAofjYSQ1DYdYzUSGhMKjKcNp0O+mc85Wb02xR9fjLUkYYY5Uj4oVA5UwxmoGFhTm2a//iJUQUdmNWfoDk+5kb27l+XM7XcUCuGeKz8OchujEZ/L48jVtmlfTsYLGspQutJbeR6fd/GbYjNuIOWugv32DEA3q6ciCr8vf4n78ddcWi91d/klrg9At+Ls8R0IrfarUteonLHy0U3buWSaZHtMfkY7CCjSNlZ+y4ORsVv/r7YtGCivqw3RHFMGAHMKwWFDeMrsTsSm5eSpDpeHquzHF5fJMNHE5BO52DXtOP6zmrAdngFJJ2RyZmNgL3LTohoHoiIRpxjE3V1P0ZukjM7c+bZmx2Wi8/emoqFnWIH0Y2SocjdSn+RY3kY++EOGXp2JfLHeL42p4J5/IQ0UEKC1G8GE1unv2GWxw2wMjQmbwvldTvQ3hxlE6iJTng3zF9ZC/MW5jDj6MIpq8nWAomDPfn1496 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0401MB2287.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(396003)(39860400002)(376002)(136003)(6512007)(8676002)(38100700001)(478600001)(66946007)(2906002)(66556008)(4326008)(66476007)(8936002)(69590400012)(83380400001)(5660300002)(6486002)(956004)(86362001)(6506007)(16526019)(2616005)(26005)(186003)(44832011)(52116002)(316002)(6666004)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Ru3f9t1pZplDgvYfQUDYitA+PTcII/Xv5xcz7Uf3QO5xvbwiWCyOO2kvWE1VaUUI79W7d13Kov2/j4UgVASJU68Do9R2QZWygExUtj3wobqNyxbPgy3cKLJkvYF6BDzIlDOcRYTGoW5Zt5wMXSBCHkRaZGdGj1YwbHCMZfaVlnCR8Mvyg10R70bKCdC5DzRC4krkvUFlC06fct3TKgSVy+JvfhSu2yXrAOMYarqEFf0lM0KzQIzv4ud336VMk06NOnX+NUfpcP8YMFstdH61P2O68kp8Nw/Ox/JtHJ9bXW4N9btDniXGwU7OdTMHAF22M2VBiBar+WyuBB9LrwJocswOwHrftqE9Fyr4dLOvhgtvEw+QpIk2p+FwIpWn+5PEjcxHDiCkLmj0r8B5QJ11nWKvLjgBeu0zE00K2Mwo1Mee3nOv2hSAUkQRJSkZX7IA2MO3h6m60Xn/oCAADz8t5I97myxG9ZFbV2dB0U8hS09LiM8MonMSwex1V5Qc+Rjcpmd4rDeSZlXOyRUVJe9IK4oAQXEM33FYgto0qT9MtMvRxEBVn74lg7P9NlG0AyVk/7LEnNbKjvlshfJl0nPG8ns3Z9pbKJWIgj1dM0KuxL3OJxIQ7UC5qo/WqDk0A74ETohHISaOE4CWYyPN28M74deUxRni7XRSb+hYtv4N4Hca/QXQ/jJQ04w8tofXsH/p2X0BFlcXDuxm6j1JdDoTKIx6HtCExsSRrPQOwhKZA5cijEz/JR8Tu8J1JNIoF3QvXduNPk80Ebt5V9sWKRrYMEYnaFYx2R1jJ52JChOgrI3fTMo3CMSUZgxWiD+mMJXHvgs4IANe562Ccznd8xVre0uR1wzvEm076GBGp26wTunuoqxZDUvfrkdStbgycGO+oYwqYQQQOiVrWARMc/CQOWaGIhkNzNejS+TTGZa1qiDKR/qCU7olPMxhzK8o7AaXr1/qsNhqkpbwPyjpH1fVLSNJW5POY916e1bBnhOz4+NvxPpbuByf6sgWmU4iRMTNdiagDbF/fqrQJ8cir5a/ziZ9xDtB6/Uz6uZJ12U/O+Xlwl4PpcVIG0ttjm9YCFcvSWjre1zbyLy7FMz9p2UGOXFdOYwhRi6f2ERKZVWyBUEIAHRijg2A0Kvr8gkGdizVjHREWuW5x291mxyEMwe9BIPFni0zJjwlEmiukwNWdaCL873VjWqKRes8jB9ibzlvxIXS9YRzepBuldB9YPu+XXMVQrcS+juocxmT5LVMGz+DSehc6vGJqZbhk2NsWiI0I7HBO+fkkGndreTnuZ4cyZAJU7kZSfz1bvbRj4lKFNWumS/Q89H3wF5+xeDVbOIy X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8aaf26b-aae7-465d-e5ba-08d8ef80dc83 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0401MB2287.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2021 11:26:41.0317 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aEsu2GFGHvnKmLxgfhCppRrlMw3DC3/8OUkOCDl53K5o0QgH+iNsk4eVynrofMryQyPBCqBd0GBiSa3RGjcPdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7232 Cc: aisheng.dong@nxp.com, daniel.baluta@gmail.com, linux-kernel@vger.kernel.org, shengjiu.wang@nxp.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, linux-imx@nxp.com, Daniel Baluta X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Daniel Baluta A DAI link has 3 components: * CPU * platform * codec(s) A component is specified via: * name * of_node * dai_name In order to avoid confusion when building a sound card we disallow matching by both name and of_node (1). soc_check_tplg_fes allows overriding certain BE links by overriding BE link name. This doesn't work well if BE link was specified via DT, because we end up with a link with both name and of_node specified which is conflicting with (1). In order to fix this we need to: * override of_node if component was specified via DT * override name, otherwise. Signed-off-by: Daniel Baluta --- sound/soc/soc-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 522bae73640a..7a1c011a7fe0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1648,7 +1648,11 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dev_err(card->dev, "init platform error"); continue; } - dai_link->platforms->name = component->name; + + if (component->dev->of_node) + dai_link->platforms->of_node = component->dev->of_node; + else + dai_link->platforms->name = component->name; /* convert non BE into BE */ if (!dai_link->no_pcm) {