lkml.org 
[lkml]   [2015]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 034/183] ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
    Date
    3.16.7-ckt8 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
    index c95033c1029b..6b6ac11bcafa 100644
    --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
    +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
    @@ -1665,7 +1665,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,

    \
     
     \ /
      Last update: 2015-03-06 12:21    [W:4.048 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site