lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 098/151] bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
    Date
    From: Tony Lindgren <tony@atomide.com>

    [ Upstream commit b13a270ace2e4c70653aa1d1d0394c553905802f ]

    Commit 94f6345712b3 ("bus: ti-sysc: Implement quirk handling for
    CLKDM_NOAUTO") should have also added the quirk for dra7 dcan1 in
    addition to dcan2 for errata i893 handling.

    Let's also pass the quirk flag for legacy mode booting for if "ti,hwmods"
    dts property is used with related dcan hwmod data. This should be only
    needed if anybody needs to git bisect earlier stable trees though.

    Fixes: 94f6345712b3 ("bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO")
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap2/omap_hwmod.c | 2 ++
    drivers/bus/ti-sysc.c | 3 +++
    2 files changed, 5 insertions(+)

    diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
    index 12b26e04686f..0c2936c7a379 100644
    --- a/arch/arm/mach-omap2/omap_hwmod.c
    +++ b/arch/arm/mach-omap2/omap_hwmod.c
    @@ -3614,6 +3614,8 @@ int omap_hwmod_init_module(struct device *dev,
    oh->flags |= HWMOD_SWSUP_SIDLE_ACT;
    if (data->cfg->quirks & SYSC_QUIRK_SWSUP_MSTANDBY)
    oh->flags |= HWMOD_SWSUP_MSTANDBY;
    + if (data->cfg->quirks & SYSC_QUIRK_CLKDM_NOAUTO)
    + oh->flags |= HWMOD_CLKDM_NOAUTO;

    error = omap_hwmod_check_module(dev, oh, data, sysc_fields,
    rev_offs, sysc_offs, syss_offs,
    diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
    index 10fcb75df68a..418ada474a85 100644
    --- a/drivers/bus/ti-sysc.c
    +++ b/drivers/bus/ti-sysc.c
    @@ -1468,6 +1468,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
    /* Quirks that need to be set based on detected module */
    SYSC_QUIRK("aess", 0, 0, 0x10, -ENODEV, 0x40000000, 0xffffffff,
    SYSC_MODULE_QUIRK_AESS),
    + /* Errata i893 handling for dra7 dcan1 and 2 */
    + SYSC_QUIRK("dcan", 0x4ae3c000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,
    + SYSC_QUIRK_CLKDM_NOAUTO),
    SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,
    SYSC_QUIRK_CLKDM_NOAUTO),
    SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff,
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-11 16:09    [W:4.388 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site