From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3106C3600B for ; Mon, 31 Mar 2025 14:55:51 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4ZRDhk2TBNz2yqd; Tue, 1 Apr 2025 01:55:50 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.105.4.254 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1743432950; cv=none; b=DuignbBMy/qsSzzEBxeer5uNyg4/ZafVSCTQoojCiGlxqSarbs5qq2buThHrCO2Bb/rrcW+aR0Jq94cxJK+phYvj2fyVp7fW+xFbZdb6OEWswUeio2ltZPN9p/C7qkGSc2Lgnpv4/KJJMuI+GNVXWRMV1mWuGyC2GceiRtpU5cg+liUbma4gqwSM+IHsnDl9UnIbN4d4m2bvSMRPtM4xNmxczmRdXu0kSb8jka9oO6ajOS0HLbX/eAFpsYU+GWZ1wmLjzbDSvjv0XvbIbI8C+oPT1CRP94UnQTYKkeYAY/HbKPScQSqjqwUtFgPbTpbLqxDYc5nz1Td1Ol8SO+rOCA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1743432950; c=relaxed/relaxed; bh=1v/1p2Yj8qA125rNjTUSBxlrAI7RMQrGeSuEPED6ACQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Vx+/s/VO4jpalVkTWFKjeh6JGTbacsSxVcWlN3i8uvX79kB+cNEfwiXxuPgEGcMkMK4wbZWp9zXBwuzlJLq+j9v3tgRWvI7Ufzm973cULG4FEH97RMX8nFDPmDhbBG20vkKUH4wxMWexQGli2dkDoHFesox24Rv0VEF8y/t9XIrELQBnjh9wijr0eR5NNYMHPpZv9iITNWTC4ElygARKuiebbBK+6NX4C7Om31KjN5DBE2LTOYCyojWt57uiC32SszCbDdYK1widdNpfqq5RcxHnm6LlfCR8jBrZjWbxyaUeheaRFEcJp3TdQfo/KPL0TauoWNI7drztkePk0BJv5g== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=pTSaXfKU; dkim-atps=neutral; spf=pass (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=sashal@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=pTSaXfKU; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=sashal@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4ZRDhj4qGzz2ynf for ; Tue, 1 Apr 2025 01:55:49 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 9CEFE614B1; Mon, 31 Mar 2025 14:55:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 962BBC4CEE4; Mon, 31 Mar 2025 14:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743432946; bh=DofeCn7+p+C7HWB7rPQvFmfiOTP/DSvjSaOvKewTANA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pTSaXfKUYpuCUm7PbKy4/cxkFnNm8+I9fi7JRURCogsTLtKDsxI2TVEM3fJg3lJoB ESeflbbcS/+/yJ+oiV0vXEiRC25spyM7LKJ6tidkpzf9IIwRURMyr1jcGHkrqrsNtJ WRIqJEdGSv6J1UuXF1wosxho7l0uxqRLEr69yFnqRCPZOwgYoMiL56fFQCJS++wEO6 mCGcHUD7EOtr2r6TN2vsHFEH+a8+WD36v1avuQ36J0uDc7Z+Hsn1s0wVDM5jDb6RPD 0WYmBUdDI4GDKm+DCmwqFsXhUEb7zI+StGhkAdRrMMy1DjVlbzMzWZZtka6SZWEi06 f1BthIORI49BQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shengjiu Wang , Mark Brown , Sasha Levin , shengjiu.wang@gmail.com, Xiubo.Lee@gmail.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 6.12 16/23] ASoC: fsl_audmix: register card device depends on 'dais' property Date: Mon, 31 Mar 2025 10:55:02 -0400 Message-Id: <20250331145510.1705478-16-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331145510.1705478-1-sashal@kernel.org> References: <20250331145510.1705478-1-sashal@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.21 Content-Transfer-Encoding: 8bit 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