From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 81B19502D69; Thu, 17 Sep 2026 17:48:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789667338; cv=none; b=bE6y+O8aLFe/neLPYDVp3TnUbmbsQyKW+BkvdVZAX6y6HJ3py8KvrOWtnQbfUxY/fNdZegtLazonQLobpCNnk7FIm6KWHEV5gC876RfSSostNni54E/sS9/tD+lv8CIR/HRjIS7ugniB70Bt3tZWEgeZEFJ851LghToTpid5xE8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789667338; c=relaxed/simple; bh=c5ARCYOCoWu834L7heKxduddgcjOV0nefOaMu3/d1Ic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HD+H3Zli2qrgTpwFGlVdiW8mC5hMSiSLjcSIRL4UR2acpfyAG6PUoTQ5j7WOfBa5GDOQMhWxLgpTmF98IElQTWwUHiejo+mNTrVAL+rC0sEjQEWJp9SiEEWh3UOEt3lnT3BGhNS8AGVvOkR6PlVeZcbFLGOBE8eiJ/1/lYawi/o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w5yDoAq8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="w5yDoAq8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C84931F000FF; Thu, 17 Sep 2026 17:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789667337; bh=9BJR6AMPxdF9E0K5DQW8ig9FYMufIgdQrUAoVZU6nTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w5yDoAq8f1BfW6W+yUwhOFyHVYyW66kT1ipbnyi+HKLUkZz888tpoGe/4M81rdziO ijzpHBXvUblvawir3VJXjRY43nEgi4PqGEDy5jk+Ef4BWEsmNx+aYravJzvDU1j5SI oKRCkwTAWSr4HIV5w3bdFKV2VCeE8D0fA/tK8EVg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ethan Nelson-Moore , Jarkko Nikula , Mark Brown , Sasha Levin Subject: [PATCH 6.12 0060/1102] ASoC: ti: omap3pandora: update board check to use DT compatible Date: Thu, 17 Sep 2026 16:00:03 +0100 Message-ID: <20260917151540.963260738@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ethan Nelson-Moore [ Upstream commit 45efb8fbdae303539e7fb5562e147583d4ed63ad ] The omap3pandora driver contains a check for the ARM machine ID via the machine_is_omap3_pandora() macro. The board concerned now supports only FDT booting, which does not use machine IDs, and therefore the code should be updated to check the DT compatible property instead. The legacy board file for this machine was removed in commit 7fcf7e061edd ("ARM: OMAP2+: Remove legacy booting support for Pandora"). The presence of this machine ID check prevents the removal of machine IDs no longer used by the kernel from arch/arm/tools/mach-types, because the machine_is_*() macros are generated from mach-types. To resolve this issue, use of_machine_is_compatible() instead. Signed-off-by: Ethan Nelson-Moore Acked-by: Jarkko Nikula Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/ti/omap3pandora.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/omap3pandora.c b/sound/soc/ti/omap3pandora.c index be69476e59d6a..5a8b2d5430f09 100644 --- a/sound/soc/ti/omap3pandora.c +++ b/sound/soc/ti/omap3pandora.c @@ -11,12 +11,12 @@ #include #include #include +#include #include #include #include -#include #include #include "omap-mcbsp.h" @@ -223,7 +223,8 @@ static int __init omap3pandora_soc_init(void) { int ret; - if (!machine_is_omap3_pandora()) + if (!of_machine_is_compatible("openpandora,omap3-pandora-600mhz") && + !of_machine_is_compatible("openpandora,omap3-pandora-1ghz")) return -ENODEV; pr_info("OMAP3 Pandora SoC init\n"); -- 2.53.0