Bug 197037 - OMAP4: Wrong clock registers used for uart 3 and 4
Summary: OMAP4: Wrong clock registers used for uart 3 and 4
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: arm (show other bugs)
Version: CURRENT
Hardware: arm Any
: --- Affects Some People
Assignee: Oleksandr Tymoshenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-01-23 21:20 UTC by Scott Ellis
Modified: 2016-04-13 21:41 UTC (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Scott Ellis 2015-01-23 21:20:34 UTC 
From Section 3.11.39.1, Table 3-1342 of the OMAP4430 ES2.x Public TRM vAP
or
From Section 3.11.39.1, Table 3-1346 of the OMAP4460 ES1.x Public TRM vAB

Register                   L4PER_CM2 Offset

CM_L4PER_UART1_CLKCTRL     0x0000 0140 
CM_L4PER_UART2_CLKCTRL     0x0000 0148 
CM_L4PER_UART3_CLKCTRL     0x0000 0150 
CM_L4PER_UART4_CLKCTRL     0x0000 0158 


diff --git sys/arm/ti/omap4/omap4_prcm_clks.c sys/arm/ti/omap4/omap4_prcm_clks.c
index de0eff6..10fab74 100644
--- sys/arm/ti/omap4/omap4_prcm_clks.c
+++ sys/arm/ti/omap4/omap4_prcm_clks.c
@@ -368,9 +368,9 @@ static struct omap4_clk_details g_omap4_clk_details[] = {
        OMAP4_GENERIC_CLOCK_DETAILS(UART2_CLK, FREQ_48MHZ, CM2_INSTANCE_MEM_REGION,
                (L4PER_CM2_OFFSET + 0x0148), CLKCTRL_MODULEMODE_ENABLE),
        OMAP4_GENERIC_CLOCK_DETAILS(UART3_CLK, FREQ_48MHZ, CM2_INSTANCE_MEM_REGION,
-               (L4PER_CM2_OFFSET + 0x0140), CLKCTRL_MODULEMODE_ENABLE),
+               (L4PER_CM2_OFFSET + 0x0150), CLKCTRL_MODULEMODE_ENABLE),
        OMAP4_GENERIC_CLOCK_DETAILS(UART4_CLK, FREQ_48MHZ, CM2_INSTANCE_MEM_REGION,
-               (L4PER_CM2_OFFSET + 0x0148), CLKCTRL_MODULEMODE_ENABLE),
+               (L4PER_CM2_OFFSET + 0x0158), CLKCTRL_MODULEMODE_ENABLE),

        /* General purpose timers */
        OMAP4_GENERIC_CLOCK_DETAILS(GPTIMER1_CLK,  -1, PRM_INSTANCE_MEM_REGION,
Comment 1 commit-hook freebsd_committer freebsd_triage 2016-04-13 21:40:36 UTC 
A commit references this bug:

Author: gonzo
Date: Wed Apr 13 21:39:46 UTC 2016
New revision: 297943
URL: https://svnweb.freebsd.org/changeset/base/297943

Log:
  Fix UART3 and UART4 clock offsets.

  Original values were copy-pasted from UART1 and UART2

  PR:		197037
  Submitted by:	Scott Ellis <scott@jumpnowtek.com>

Changes:
  head/sys/arm/ti/omap4/omap4_prcm_clks.c