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 1A2C719D084; Mon, 23 Jun 2025 21:43:02 +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=1750714983; cv=none; b=JnJw//GNNVqm+lRRBQ3Ax4SmCsqWMb9njwDj7/GkBEam43VgFHzc2w7TOfBx3Qwn1zvyWmfnOxMO/EwjnSsSKydfiQQJGa9Yl0u3fSsWgQGPwIBBBkIuFZ0sO5C+fWR0ILeaKFVO4IIoAXh+0KWg33ZkoiglXDnPZyWWQe5KDrU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714983; c=relaxed/simple; bh=D9YKm19cmeddaIxcjOZFR1Qt0rea7c5TJH2LdqFGhjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JZJpQTy7VPam3SPlm15LehV2E5QvlC7U9dRbJMwXI4nFPC8gRo8AU2UEj8sRCPPqchIj7cmyonmjGftljzuj9CnXSH7m83gmvBvuNaGgN14bKHO0Z2aFXcHpuIMjDyv/n2UzzK3vxB7j2ajwYZqzgrf2GqtuyLSgOF+F6vOvfbg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yVAo6K6r; 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="yVAo6K6r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 494C3C4CEEA; Mon, 23 Jun 2025 21:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714982; bh=D9YKm19cmeddaIxcjOZFR1Qt0rea7c5TJH2LdqFGhjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yVAo6K6rbpu0AW3M6f7iP2BGnpucQ+eMOgdj/E9XK6J+gaQkn3qR8VDzBb1fIaMEN fcJam0kvQennY/kn4JKjcp4dYOBDx0dHngXZysjEm28hmwaafXkKG1zqcL50VbSyTu 3HOw7CTlW7rONODYRvEWVE5YjaET69ULFNhANOm8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Kemnade , Kevin Hilman , Tony Lindgren Subject: [PATCH 5.15 221/411] ARM: omap: pmic-cpcap: do not mess around without CPCAP or OMAP4 Date: Mon, 23 Jun 2025 15:06:05 +0200 Message-ID: <20250623130639.226109773@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Kemnade commit 7397daf1029d5bfd3415ec8622f5179603d5702d upstream. The late init call just writes to omap4 registers as soon as CONFIG_MFD_CPCAP is enabled without checking whether the cpcap driver is actually there or the SoC is indeed an OMAP4. Rather do these things only with the right device combination. Fixes booting the BT200 with said configuration enabled and non-factory X-Loader and probably also some surprising behavior on other devices. Fixes: c145649bf262 ("ARM: OMAP2+: Configure voltage controller for cpcap to low-speed") CC: stable@vger.kernel.org Signed-off-by: Andreas Kemnade Reivewed-by: Tony Lindgren Link: https://lore.kernel.org/r/20250331144439.769697-1-andreas@kemnade.info Signed-off-by: Kevin Hilman Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-omap2/pmic-cpcap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/arch/arm/mach-omap2/pmic-cpcap.c +++ b/arch/arm/mach-omap2/pmic-cpcap.c @@ -264,7 +264,11 @@ int __init omap4_cpcap_init(void) static int __init cpcap_late_init(void) { - omap4_vc_set_pmic_signaling(PWRDM_POWER_RET); + if (!of_find_compatible_node(NULL, NULL, "motorola,cpcap")) + return 0; + + if (soc_is_omap443x() || soc_is_omap446x() || soc_is_omap447x()) + omap4_vc_set_pmic_signaling(PWRDM_POWER_RET); return 0; }