From 1b71313723e8791b16653877fff7edf654d76771 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Wed, 10 Sep 2008 10:47:43 -0600 Subject: [PATCH] OMAP2/3 clock: annotate PRM clocks that are missing clockdomains Some PRM clocks are missing clockdomain assignments; add them. Also, in OMAP2xxx clock tree, standardize the name for wdt1_osc_ck. References for the OMAP2xxx clocks: OMAP2420 Multimedia Processor Silicon Revision 2.1.1, 2.2 TRM Version Q Table 18-41: - wdt1_osc_ck References for the OMAP3xxx clocks: OMAP34xx Multimedia Device Silicon Revision 3.0 Version I TRM Figure 4-13: - sys_clkout1, Table 4-37: - sys_ck Table 4-38: - omap_32k_fck, osc_sys_ck, Figure 4-56: - sr1_fck, sr2_fck Figure 4-57: - omap_96m_alwon_fck Section 4.7.7.13: - sr1_fck, sr2_fck OMAP34xx Multimedia High Security (HS) Device Silicon Revision 3.0 Security Addendum Version B TRM Table 2-5: - usim_fck Figure 3-29: - secure_32k_fck, gpt12_fck, wdt1_fck Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock24xx.h | 3 ++- arch/arm/mach-omap2/clock34xx.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index 72244504b7d..8915b523b36 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h @@ -852,9 +852,10 @@ static struct clk func_12m_ck = { /* Secure timer, only available in secure mode */ static struct clk wdt1_osc_ck = { - .name = "ck_wdt1_osc", + .name = "wdt1_osc_ck", .parent = &osc_ck, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 5baf528a864..d38ce37df0b 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -74,6 +74,7 @@ static struct clk omap_32k_fck = { .rate = 32768, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -82,6 +83,7 @@ static struct clk secure_32k_fck = { .rate = 32768, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -91,6 +93,7 @@ static struct clk virt_12m_ck = { .rate = 12000000, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -99,6 +102,7 @@ static struct clk virt_13m_ck = { .rate = 13000000, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -107,6 +111,7 @@ static struct clk virt_16_8m_ck = { .rate = 16800000, .flags = CLOCK_IN_OMAP3430ES2 | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -115,6 +120,7 @@ static struct clk virt_19_2m_ck = { .rate = 19200000, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -123,6 +129,7 @@ static struct clk virt_26m_ck = { .rate = 26000000, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -131,6 +138,7 @@ static struct clk virt_38_4m_ck = { .rate = 38400000, .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -185,6 +193,7 @@ static struct clk osc_sys_ck = { /* REVISIT: deal with autoextclkmode? */ .flags = CLOCK_IN_OMAP343X | RATE_FIXED | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &omap2_clksel_recalc, }; @@ -209,6 +218,7 @@ static struct clk sys_ck = { .clksel_mask = OMAP_SYSCLKDIV_MASK, .clksel = sys_clksel, .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &omap2_clksel_recalc, }; @@ -222,6 +232,7 @@ static struct clk sys_altclk = { static struct clk mcbsp_clks = { .name = "mcbsp_clks", .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &propagate_rate, }; @@ -233,6 +244,7 @@ static struct clk sys_clkout1 = { .enable_reg = (__force void __iomem *)OMAP3430_PRM_CLKOUT_CTRL, .enable_bit = OMAP3430_CLKOUT_EN_SHIFT, .flags = CLOCK_IN_OMAP343X, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; @@ -678,6 +690,7 @@ static struct clk omap_96m_alwon_fck = { .clksel = omap_96m_alwon_fck_clksel, .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | PARENT_CONTROLS_CLOCK, + .clkdm = { .name = "prm_clkdm" }, .recalc = &omap2_clksel_recalc, }; @@ -2309,6 +2322,7 @@ static struct clk usim_fck = { .clksel_mask = OMAP3430ES2_CLKSEL_USIMOCP_MASK, .clksel = usim_clksel, .flags = CLOCK_IN_OMAP3430ES2, + .clkdm = { .name = "prm_clkdm" }, .recalc = &omap2_clksel_recalc, }; @@ -3035,6 +3049,7 @@ static struct clk sr1_fck = { .enable_reg = _OMAP34XX_CM_REGADDR(WKUP_MOD, CM_FCLKEN), .enable_bit = OMAP3430_EN_SR1_SHIFT, .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; @@ -3045,6 +3060,7 @@ static struct clk sr2_fck = { .enable_reg = _OMAP34XX_CM_REGADDR(WKUP_MOD, CM_FCLKEN), .enable_bit = OMAP3430_EN_SR2_SHIFT, .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; @@ -3063,6 +3079,7 @@ static struct clk gpt12_fck = { .name = "gpt12_fck", .parent = &secure_32k_fck, .flags = CLOCK_IN_OMAP343X | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; @@ -3070,6 +3087,7 @@ static struct clk wdt1_fck = { .name = "wdt1_fck", .parent = &secure_32k_fck, .flags = CLOCK_IN_OMAP343X | ALWAYS_ENABLED, + .clkdm = { .name = "prm_clkdm" }, .recalc = &followparent_recalc, }; -- 2.41.1