diff options
author | Imre Deak <imre.deak@solidboot.com> | 2007-03-05 10:22:58 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-09-20 21:34:49 -0400 |
commit | df2c2e70f0cb3fa2586beffc41fcd7e093453bc5 (patch) | |
tree | a26db59b0a0af428cd94d0160997e05b5e5e1a26 /arch/arm/mach-omap1/clock.h | |
parent | c72d8950baf737fe4da1982a8fad1f33fecdde2e (diff) |
ARM: OMAP: add SoSSI clock
This is needed, so that disabling the SoSSI clock during idle can
be prevented.
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/clock.h')
-rw-r--r-- | arch/arm/mach-omap1/clock.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 4d6060c2facb..6eadf72828d8 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h | |||
@@ -17,6 +17,8 @@ static int omap1_clk_enable_generic(struct clk * clk); | |||
17 | static void omap1_clk_disable_generic(struct clk * clk); | 17 | static void omap1_clk_disable_generic(struct clk * clk); |
18 | static void omap1_ckctl_recalc(struct clk * clk); | 18 | static void omap1_ckctl_recalc(struct clk * clk); |
19 | static void omap1_watchdog_recalc(struct clk * clk); | 19 | static void omap1_watchdog_recalc(struct clk * clk); |
20 | static int omap1_set_sossi_rate(struct clk *clk, unsigned long rate); | ||
21 | static void omap1_sossi_recalc(struct clk *clk); | ||
20 | static void omap1_ckctl_recalc_dsp_domain(struct clk * clk); | 22 | static void omap1_ckctl_recalc_dsp_domain(struct clk * clk); |
21 | static int omap1_clk_enable_dsp_domain(struct clk * clk); | 23 | static int omap1_clk_enable_dsp_domain(struct clk * clk); |
22 | static int omap1_clk_set_rate_dsp_domain(struct clk * clk, unsigned long rate); | 24 | static int omap1_clk_set_rate_dsp_domain(struct clk * clk, unsigned long rate); |
@@ -168,9 +170,10 @@ static struct clk ck_dpll1 = { | |||
168 | 170 | ||
169 | static struct arm_idlect1_clk ck_dpll1out = { | 171 | static struct arm_idlect1_clk ck_dpll1out = { |
170 | .clk = { | 172 | .clk = { |
171 | .name = "ck_dpll1out", | 173 | .name = "ck_dpll1out", |
172 | .parent = &ck_dpll1, | 174 | .parent = &ck_dpll1, |
173 | .flags = CLOCK_IN_OMAP16XX | CLOCK_IDLE_CONTROL, | 175 | .flags = CLOCK_IN_OMAP16XX | CLOCK_IDLE_CONTROL | |
176 | ENABLE_REG_32BIT | RATE_PROPAGATES, | ||
174 | .enable_reg = (void __iomem *)ARM_IDLECT2, | 177 | .enable_reg = (void __iomem *)ARM_IDLECT2, |
175 | .enable_bit = EN_CKOUT_ARM, | 178 | .enable_bit = EN_CKOUT_ARM, |
176 | .recalc = &followparent_recalc, | 179 | .recalc = &followparent_recalc, |
@@ -180,6 +183,19 @@ static struct arm_idlect1_clk ck_dpll1out = { | |||
180 | .idlect_shift = 12, | 183 | .idlect_shift = 12, |
181 | }; | 184 | }; |
182 | 185 | ||
186 | static struct clk sossi_ck = { | ||
187 | .name = "ck_sossi", | ||
188 | .parent = &ck_dpll1out.clk, | ||
189 | .flags = CLOCK_IN_OMAP16XX | CLOCK_NO_IDLE_PARENT | | ||
190 | ENABLE_REG_32BIT, | ||
191 | .enable_reg = (void __iomem *)MOD_CONF_CTRL_1, | ||
192 | .enable_bit = 16, | ||
193 | .recalc = &omap1_sossi_recalc, | ||
194 | .set_rate = &omap1_set_sossi_rate, | ||
195 | .enable = &omap1_clk_enable_generic, | ||
196 | .disable = &omap1_clk_disable_generic, | ||
197 | }; | ||
198 | |||
183 | static struct clk arm_ck = { | 199 | static struct clk arm_ck = { |
184 | .name = "arm_ck", | 200 | .name = "arm_ck", |
185 | .parent = &ck_dpll1, | 201 | .parent = &ck_dpll1, |
@@ -760,6 +776,7 @@ static struct clk * onchip_clks[] = { | |||
760 | &ck_dpll1, | 776 | &ck_dpll1, |
761 | /* CK_GEN1 clocks */ | 777 | /* CK_GEN1 clocks */ |
762 | &ck_dpll1out.clk, | 778 | &ck_dpll1out.clk, |
779 | &sossi_ck, | ||
763 | &arm_ck, | 780 | &arm_ck, |
764 | &armper_ck.clk, | 781 | &armper_ck.clk, |
765 | &arm_gpio_ck, | 782 | &arm_gpio_ck, |