Skip to content

Commit b13a270

Browse files
committed
bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
Commit 94f6345 ("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: 94f6345 ("bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO") Signed-off-by: Tony Lindgren <[email protected]>
1 parent e700ac2 commit b13a270

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

arch/arm/mach-omap2/omap_hwmod.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3614,6 +3614,8 @@ int omap_hwmod_init_module(struct device *dev,
36143614
oh->flags |= HWMOD_SWSUP_SIDLE_ACT;
36153615
if (data->cfg->quirks & SYSC_QUIRK_SWSUP_MSTANDBY)
36163616
oh->flags |= HWMOD_SWSUP_MSTANDBY;
3617+
if (data->cfg->quirks & SYSC_QUIRK_CLKDM_NOAUTO)
3618+
oh->flags |= HWMOD_CLKDM_NOAUTO;
36173619

36183620
error = omap_hwmod_check_module(dev, oh, data, sysc_fields,
36193621
rev_offs, sysc_offs, syss_offs,

drivers/bus/ti-sysc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
14641464
/* Quirks that need to be set based on detected module */
14651465
SYSC_QUIRK("aess", 0, 0, 0x10, -ENODEV, 0x40000000, 0xffffffff,
14661466
SYSC_MODULE_QUIRK_AESS),
1467+
/* Errata i893 handling for dra7 dcan1 and 2 */
1468+
SYSC_QUIRK("dcan", 0x4ae3c000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,
1469+
SYSC_QUIRK_CLKDM_NOAUTO),
14671470
SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff,
14681471
SYSC_QUIRK_CLKDM_NOAUTO),
14691472
SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff,

0 commit comments

Comments
 (0)