Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c7e36bf authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Paul Walmsley
Browse files

ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3 



With commit '7dedd346: ARM: OMAP2+: hwmod: Fix a crash in _setup_reset()
with DEBUG_LL' we moved from parsing cmdline to identify uart used
for earlycon to using the requsite hwmod CONFIG_DEBUG_OMAPxUARTy FLAGS.

On DRA7 UART3 hwmod doesn't have this flag enabled, and atleast on
BeagleBoard-X15, where we use UART3 for console, boot fails with
DEBUG_LL enabled. Enable DEBUG_OMAP4UART3_FLAGS for UART3 hwmod.

For using DEBUG_LL, enable CONFIG_DEBUG_OMAP4UART3 in menuconfig.

Fixes: 90020c7b ("ARM: OMAP: DRA7: hwmod: Create initial DRA7XX SoC data")
Cc: <stable@vger.kernel.org> # v3.12+
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 556708fe

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ static struct omap_hwmod dra7xx_uart3_hwmod = { 
	.class		= &dra7xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.main_clk	= "uart3_gfclk_mux",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP4UART3_FLAGS,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_L4PER_UART3_CLKCTRL_OFFSET,