From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 258A72571AD; Thu, 17 Apr 2025 17:57:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912663; cv=none; b=FGJ5kaLvZz4jFVY+lrUpU2sBzFAIPleU8bwo5FkWLuYq6Tkav60Ty0W3C2RSFaAmPMihBtUL7hW6/GSW5MfsjpnimLdvD8Q6EnUQOcrOoA+8qVyKikfKg5Lt7n3ZDEkASb7p5UE2Qd+usQ+aYsbHYrj1xVKoKFKE51A3nTvQ9nk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912663; c=relaxed/simple; bh=tkB5iytGEYguoKFroI1cg68L8jazL/+f4OoKFTuqDuM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=REaiwmszWxDgnDX7vVOULLpTaDLyBavw+JloVmcgY+ITgjjGo0cVLCBGbv/RvdknhbDmkHNyXW0j6JoZFZgf8pa4k0jxM2P+J/gty1F0/p8IIkLyJBRryotmtcOCp2LmF2XDqiuAJn2vXbYmY9dvnijumlKDiSBkULQ9nbQyA5Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vRuhJLOU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vRuhJLOU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 359A6C4CEE4; Thu, 17 Apr 2025 17:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744912662; bh=tkB5iytGEYguoKFroI1cg68L8jazL/+f4OoKFTuqDuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vRuhJLOUCv4m4vDYRrUPrUgDdpJ0JNBin6gUYhKsazyZe9lYABDc8JZQk+2toRHf4 7xFMzFe0RFVyXTAaMmsIQ9GfAvl4/cfrDkIivENdXldWGx4T1TmLsD+gadGIOL1Svb z3LMxZ9dBtHFdmidSJT5+wCAY8bzshrK6bxXO1Qk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shengjiu Wang , Mark Brown , Sasha Levin Subject: [PATCH 6.14 084/449] ASoC: fsl_audmix: register card device depends on dais property Date: Thu, 17 Apr 2025 19:46:12 +0200 Message-ID: <20250417175121.353126274@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shengjiu Wang [ Upstream commit 294a60e5e9830045c161181286d44ce669f88833 ] In order to make the audmix device linked by audio graph card, make 'dais' property to be optional. If 'dais' property exists, then register the imx-audmix card driver. otherwise, it should be linked by audio graph card. Signed-off-by: Shengjiu Wang Link: https://patch.msgid.link/20250226100508.2352568-5-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_audmix.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index 3cd9a66b70a15..7981d598ba139 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -488,11 +488,17 @@ static int fsl_audmix_probe(struct platform_device *pdev) goto err_disable_pm; } - priv->pdev = platform_device_register_data(dev, "imx-audmix", 0, NULL, 0); - if (IS_ERR(priv->pdev)) { - ret = PTR_ERR(priv->pdev); - dev_err(dev, "failed to register platform: %d\n", ret); - goto err_disable_pm; + /* + * If dais property exist, then register the imx-audmix card driver. + * otherwise, it should be linked by audio graph card. + */ + if (of_find_property(pdev->dev.of_node, "dais", NULL)) { + priv->pdev = platform_device_register_data(dev, "imx-audmix", 0, NULL, 0); + if (IS_ERR(priv->pdev)) { + ret = PTR_ERR(priv->pdev); + dev_err(dev, "failed to register platform: %d\n", ret); + goto err_disable_pm; + } } return 0; -- 2.39.5