| From 38958c15dc640a9249e4f0cd0dfb0ddc7a23464d Mon Sep 17 00:00:00 2001 |
| From: Rajendra Nayak <rnayak@ti.com> |
| Date: Thu, 12 Dec 2013 15:22:49 +0530 |
| Subject: ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL |
| |
| From: Rajendra Nayak <rnayak@ti.com> |
| |
| commit 38958c15dc640a9249e4f0cd0dfb0ddc7a23464d 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 though, we seem to be missing this flag, and atleast on the DRA7 EVM |
| where we use uart1 for console, boot fails with DEBUG_LL enabled. |
| |
| Reported-by: Lokesh Vutla <lokeshvutla@ti.com> |
| Tested-by: Lokesh Vutla <lokeshvutla@ti.com> # on a different base |
| Signed-off-by: Rajendra Nayak <rnayak@ti.com> |
| Fixes: 7dedd346941d ("ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL") |
| 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 |
| @@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hw |
| .class = &dra7xx_uart_hwmod_class, |
| .clkdm_name = "l4per_clkdm", |
| .main_clk = "uart1_gfclk_mux", |
| - .flags = HWMOD_SWSUP_SIDLE_ACT, |
| + .flags = HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP2UART1_FLAGS, |
| .prcm = { |
| .omap4 = { |
| .clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET, |
