Skip to content

Commit 5626fef

Browse files
akemnadegregkh
authored andcommitted
ARM: omap: pmic-cpcap: do not mess around without CPCAP or OMAP4
commit 7397daf 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: c145649 ("ARM: OMAP2+: Configure voltage controller for cpcap to low-speed") CC: stable@vger.kernel.org Signed-off-by: Andreas Kemnade <andreas@kemnade.info> Reivewed-by: Tony Lindgren <tony@atomide.com> Link: https://lore.kernel.org/r/20250331144439.769697-1-andreas@kemnade.info Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1c40263 commit 5626fef

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

arch/arm/mach-omap2/pmic-cpcap.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,11 @@ int __init omap4_cpcap_init(void)
264264

265265
static int __init cpcap_late_init(void)
266266
{
267-
omap4_vc_set_pmic_signaling(PWRDM_POWER_RET);
267+
if (!of_find_compatible_node(NULL, NULL, "motorola,cpcap"))
268+
return 0;
269+
270+
if (soc_is_omap443x() || soc_is_omap446x() || soc_is_omap447x())
271+
omap4_vc_set_pmic_signaling(PWRDM_POWER_RET);
268272

269273
return 0;
270274
}

0 commit comments

Comments
 (0)