ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
Subsystems (4)
PATCH 1/1 ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
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.
--- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +1 -1
@@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hwmod = { .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,
Signature · 1 line
1.7.9.5
PATCH 1/1 ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
Hi Rajendra,
Quoted 9 lines · Rajendra Nayak
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 hwmodCONFIG_DEBUG_OMAPxUARTyFLAGS.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_LLenabled.Reported-by Lokesh Vutla <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>
Tested on DRA7 evm using Tero's V10 clock series.
Thanks and regards,
Lokesh
Quoted 18 lines
--- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-omap2/omap_hwmod_7xx_data.c +1
-1@@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hwmod = { .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,
Paul Walmsley
maintainerPATCH 1/1 ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
In reply to Rajendra NayakQuoted 9 lines · Rajendra Nayak
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 hwmodCONFIG_DEBUG_OMAPxUARTyFLAGS.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_LLenabled.Reported-by Lokesh Vutla <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>
Thanks, queued with Lokesh's Tested-by.
- Paul
Paul Walmsley
maintainerPATCH 1/1 ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
In reply to Rajendra NayakQuoted 9 lines · Rajendra Nayak
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 hwmodCONFIG_DEBUG_OMAPxUARTyFLAGS.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_LLenabled.Reported-by Lokesh Vutla <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>
By the way, for future patches that fix previous commits, please put "Fixes:" lines along with your signoffs, and Cc: lines for the original patch authors (if they're not you). I've added the following line in this case:
Fixes: 7dedd346941d ("ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL")regards,
- Paul