Commit 99d91382 authored Dec 09, 2019 by Tony Lindgren Committed by Greg Kroah-Hartman Feb 01, 2020

bus: ti-sysc: Fix missing force mstandby quirk handling



[ Upstream commit 93c60483b5feefced92b869d5f97769495bc6313 ]

Commit 03856e928b0e ("bus: ti-sysc: Handle mstandby quirk and use it for
musb") added quirk handling for mstandby quirk but did not consider that
we also need a quirk variant for SYSC_QUIRK_FORCE_MSTANDBY.

We need to use forced idle mode for both SYSC_QUIRK_SWSUP_MSTANDBY and
SYSC_QUIRK_FORCE_MSTANDBY, but SYSC_QUIRK_SWSUP_MSTANDBY also need to
additionally also configure no-idle mode when enabled.

Fixes: 03856e928b0e ("bus: ti-sysc: Handle mstandby quirk and use it for musb")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 58b09300

drivers/bus/ti-sysc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -987,7 +987,8 @@ static int sysc_disable_module(struct device *dev)
		return ret;
		}

		if (ddata->cfg.quirks & SYSC_QUIRK_SWSUP_MSTANDBY)
		if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_MSTANDBY) \|\|
		ddata->cfg.quirks & (SYSC_QUIRK_FORCE_MSTANDBY))
		best_mode = SYSC_IDLE_FORCE;

		reg &= ~(SYSC_IDLE_MASK << regbits->midle_shift);

include/linux/platform_data/ti-sysc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ struct sysc_regbits {
		s8 emufree_shift;
		};

		#define SYSC_QUIRK_FORCE_MSTANDBY BIT(20)
		#define SYSC_MODULE_QUIRK_AESS BIT(19)
		#define SYSC_MODULE_QUIRK_SGX BIT(18)
		#define SYSC_MODULE_QUIRK_HDQ1W BIT(17)