| From 1c7e36bfc3e2fb2df5e2d1989a4b6fb9055a0f9b Mon Sep 17 00:00:00 2001 |
| From: Lokesh Vutla <lokeshvutla@ti.com> |
| Date: Thu, 8 Jan 2015 17:22:04 +0530 |
| Subject: ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3 |
| |
| From: Lokesh Vutla <lokeshvutla@ti.com> |
| |
| commit 1c7e36bfc3e2fb2df5e2d1989a4b6fb9055a0f9b upstream. |
| |
| With commit '7dedd34: 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: 90020c7b2c5e ("ARM: OMAP: DRA7: hwmod: Create initial DRA7XX SoC data") |
| Reviewed-by: Felipe Balbi <balbi@ti.com> |
| Acked-by: Felipe Balbi <balbi@ti.com> |
| Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> |
| Signed-off-by: Paul Walmsley <paul@pwsan.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c |
| +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c |
| @@ -1669,7 +1669,7 @@ static struct omap_hwmod dra7xx_uart3_hw |
| .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, |
