Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Daniel Baluta <daniel.baluta@oss.nxp.com>
To:     broonie@kernel.org, alsa-devel@alsa-project.org
Cc:     lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
        linux-kernel@vger.kernel.org, linux-imx@nxp.com,
        ranjani.sridharan@linux.intel.com,
        pierre-louis.bossart@linux.intel.com, shengjiu.wang@nxp.com,
        Daniel Baluta <daniel.baluta@nxp.com>
Subject: [PATCH] ASoC: core: Don't set platform name when of_node is set
Date:   Tue,  9 Mar 2021 10:23:28 +0200
Message-Id: <20210309082328.38388-1-daniel.baluta@oss.nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (86.127.155.38) by AM0PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:208:122::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Tue, 9 Mar 2021 08:23:40 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 4f50c875-f527-4f74-ab76-08d8e2d4a5b6
X-MS-TrafficTypeDiagnostic: VE1PR04MB7423:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VE1PR04MB7423CD47373D0ED06042ED40B8929@VE1PR04MB7423.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2000;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Knu4qAWH+wubBJtC1/RiAysROB6w+fjQGwH/nmEjAnaPSMtWrfViMTMvftmWZkADOf575Fi7W4GxVB0LluXEOBPUzwtOjJ0OYxDnB5vaah1f1/TmO8cyQzHz/wRrRVV68oTK2CFhVFXpP7QNU3VHlCaGaeh49rkD4erXS946BB1kIViJ/0aJ7JYI9NRKk59dWC8A0kZ1Qfg8aF16AF5UGHjyYlJ3yPA7MPw82dsiUlETu2EzegvwjBih6EglgeStQIQoGbNV0hSUeMI+JfpJGwz7l1eRQtWOjf7pQw4m5zDqbOTEyePnc+WnH99jRBHBkLpdUAd97d+r1brMaZ8du1KIBNuRortbYHIpK9NooSjYMgeJIa9QnduNYeVF4iBlCaNH48UXPG9rjiqJlvtphdg9Bsy+HXjAAZtKaNKRLyyl5gEgIxCzcKMrkIsXNx3h2kB581VD1gnXFY6sWpjbV5hqohm9KfOzIGRdK5Y06RIZGkHejJVvgjF5XVS0Sx/o0bYKQWG7KGpI86g/BXImzCSt1vsm1fOxj0/cdLIMDcDqWDsVG36MXr63DckatgZR
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)(396003)(136003)(39860400002)(376002)(346002)(366004)(44832011)(1076003)(2616005)(16526019)(186003)(4744005)(5660300002)(6512007)(2906002)(26005)(6666004)(956004)(478600001)(69590400012)(6486002)(66946007)(66476007)(66556008)(4326008)(8676002)(6506007)(8936002)(83380400001)(86362001)(52116002)(316002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?SO8xF0OoCpPv1lNhTPlWlxOERax3BdKTaj1Qb6DRoMdYNgRQAnqf0bWnlstK?=
 =?us-ascii?Q?gK0RPxX2svlI4xTiUmlHsvrkRqPNSEIWSwGzkNIcxTWp1mYeNT8Qnp6TMXfI?=
 =?us-ascii?Q?WSC5sUaF1yr8TtQ9RkOOiQnqaCxQf+H5wV7JK5gx98Kq7TUb3/PFBDyg176N?=
 =?us-ascii?Q?gwtaIO8i11amfvgfSsHyqz0/fhyXbwl1PQH+PphWsv/8FqRTfm8axTlj78mj?=
 =?us-ascii?Q?zMtwUiRs7z/kIlWWCZTxfoi18bOpObAr6RsWDG2sQ3Vx23uukYHHT4zmTh0/?=
 =?us-ascii?Q?YF/71UMs1N+aTTsc/0oHwoTiTeRZWfJSY0uoRF7Qi6wlSrmNpid2vb4YoJ2S?=
 =?us-ascii?Q?VeYKmOqJUaY38tYvGDchclYdMa7LQPPlfLGBWLR+30l/wObJ6ypYZ9uR4Sl1?=
 =?us-ascii?Q?knmcdus9CMc64KpvoME301ED3G4x88JLofMB55Dv0LVNJYtJZLPDcH6VjrcX?=
 =?us-ascii?Q?lUpPuoNaqDdRL4Mc/oQM34irlb94iB3tqG9XXv4UwBribF3OAt3U/59d69M0?=
 =?us-ascii?Q?GlLg36KM0Tqh5WiF0L96C/tAMeGahKfwkwf5hCdLeik8LaEWfHMNQJcp+w+G?=
 =?us-ascii?Q?NvsxPfLgKoG5WXuTewcODmVu48grJjUGOV99VnH/6VdSYO+/EHWnTgYbZlDu?=
 =?us-ascii?Q?UN5RtiVxd34OrRjEHvXHI5VH1Ko+UbxX+nUF3Dpr6AaC97/hQB9x+Wbn4LAL?=
 =?us-ascii?Q?vC1rEg2o1PradEsxCVOsnsRDfm2hSJl5fruVo2QoJytdNKvZD8+c+9HFwqKl?=
 =?us-ascii?Q?8DGAZu1ZYroOZ3qdhofEbVoFmfmjx3OZ5m3zj/g3ZxgFMUiOLZQR8Xn/YLB/?=
 =?us-ascii?Q?3TT62EaqsXuzHKo3moYbu19AH1BHlD5p/oiKv8GwuVUI/p/ozPcFej5oiHwH?=
 =?us-ascii?Q?/FCURhLf0yWgq3w0omiRGtn54JuAl/vCbi/92wZIQw5lsW7AdoEpLRuL9hiu?=
 =?us-ascii?Q?U2dS1dENzqpCA+bonxQvyToXdeVrb9OBYPavSEoDeaIcld31H6RR3gX1lrT0?=
 =?us-ascii?Q?g+yLVoJxQb7B0oZrqaDM+/qxAoNm3P+wm2N4vnRTrOYyUskC4qsGCi0eWtIQ?=
 =?us-ascii?Q?WxK4IJSvS0bxOvJCRB0bSRM6nDtKBoRJ/UdnjR5kCx/37hbjX2YYgGES4UJc?=
 =?us-ascii?Q?dRBjYVGnmmf704+u/5+20Kopr5EZBmV1MtJshsd8fRsz0l6ODxxRjU0mKZyv?=
 =?us-ascii?Q?3VOyi5vzvbpdOt08moL6cbw9WPraPgvbKEefF3NOimZIqTLLnW5+g6crBmEn?=
 =?us-ascii?Q?8sNm4vL7V4yfShxGjW10vj8zLIvWhPAOTURGBFGN5Jc0KZ4Rd+caSTPQ74Fj?=
 =?us-ascii?Q?y7W4w00aGsXUxW7VLWCzi/8d?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f50c875-f527-4f74-ab76-08d8e2d4a5b6
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0401MB2287.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2021 08:23:41.6220
 (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: YTWupmlAZZzwu0HbRGEQ97LaOstVYSG9XZkvIvEVuUznz5T/c5uB0xZQ2S/Rh3++dxdq7j150jb/nbn3jNsG5A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7423
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Daniel Baluta <daniel.baluta@nxp.com>

Platform may be specified by either name or OF node but not
both.

For OF node platforms (e.g i.MX) we end up with both platform name
and of_node set and sound card registration will fail with the error:

  asoc-simple-card sof-sound-wm8960: ASoC: Neither/both
  platform name/of_node are set for sai1-wm8960-hifi

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/soc-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 16ba54eb8164..76ab42fa9461 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1660,7 +1660,9 @@ 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 (!dai_link->platforms->of_node)
+				dai_link->platforms->name = component->name;
 
 			/* convert non BE into BE */
 			if (!dai_link->no_pcm) {
-- 
2.27.0