Skip to content

L
linux
Commit 37b797b2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream

parents 1e74c891 30ff720b
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 189 deletions
arch/arm/mach-omap1/clock.c
View file @ 37b797b2
...@@ -50,10 +50,10 @@ static int omap1_clk_enable_dsp_domain(struct clk *clk) ...@@ -50,10 +50,10 @@ static int omap1_clk_enable_dsp_domain(struct clk *clk)
{ {
int retval; int retval;
retval = omap1_clk_use(&api_ck.clk); retval = omap1_clk_enable(&api_ck.clk);
if (!retval) { if (!retval) {
retval = omap1_clk_enable(clk); retval = omap1_clk_enable_generic(clk);
omap1_clk_unuse(&api_ck.clk); omap1_clk_disable(&api_ck.clk);
} }
return retval; return retval;
...@@ -61,9 +61,9 @@ static int omap1_clk_enable_dsp_domain(struct clk *clk) ...@@ -61,9 +61,9 @@ static int omap1_clk_enable_dsp_domain(struct clk *clk)
static void omap1_clk_disable_dsp_domain(struct clk *clk) static void omap1_clk_disable_dsp_domain(struct clk *clk)
{ {
if (omap1_clk_use(&api_ck.clk) == 0) { if (omap1_clk_enable(&api_ck.clk) == 0) {
omap1_clk_disable(clk); omap1_clk_disable_generic(clk);
omap1_clk_unuse(&api_ck.clk); omap1_clk_disable(&api_ck.clk);
} }
} }
...@@ -72,7 +72,7 @@ static int omap1_clk_enable_uart_functional(struct clk *clk) ...@@ -72,7 +72,7 @@ static int omap1_clk_enable_uart_functional(struct clk *clk)
int ret; int ret;
struct uart_clk *uclk; struct uart_clk *uclk;
ret = omap1_clk_enable(clk); ret = omap1_clk_enable_generic(clk);
if (ret == 0) { if (ret == 0) {
/* Set smart idle acknowledgement mode */ /* Set smart idle acknowledgement mode */
uclk = (struct uart_clk *)clk; uclk = (struct uart_clk *)clk;
...@@ -91,7 +91,7 @@ static void omap1_clk_disable_uart_functional(struct clk *clk) ...@@ -91,7 +91,7 @@ static void omap1_clk_disable_uart_functional(struct clk *clk)
uclk = (struct uart_clk *)clk; uclk = (struct uart_clk *)clk;
omap_writeb((omap_readb(uclk->sysc_addr) & ~0x18), uclk->sysc_addr); omap_writeb((omap_readb(uclk->sysc_addr) & ~0x18), uclk->sysc_addr);
omap1_clk_disable(clk); omap1_clk_disable_generic(clk);
} }
static void omap1_clk_allow_idle(struct clk *clk) static void omap1_clk_allow_idle(struct clk *clk)
...@@ -230,9 +230,9 @@ static void omap1_ckctl_recalc_dsp_domain(struct clk * clk) ...@@ -230,9 +230,9 @@ static void omap1_ckctl_recalc_dsp_domain(struct clk * clk)
* Note that DSP_CKCTL virt addr = phys addr, so * Note that DSP_CKCTL virt addr = phys addr, so
* we must use __raw_readw() instead of omap_readw(). * we must use __raw_readw() instead of omap_readw().
*/ */
omap1_clk_use(&api_ck.clk); omap1_clk_enable(&api_ck.clk);
dsor = 1 << (3 & (__raw_readw(DSP_CKCTL) >> clk->rate_offset)); dsor = 1 << (3 & (__raw_readw(DSP_CKCTL) >> clk->rate_offset));
omap1_clk_unuse(&api_ck.clk); omap1_clk_disable(&api_ck.clk);
if (unlikely(clk->rate == clk->parent->rate / dsor)) if (unlikely(clk->rate == clk->parent->rate / dsor))
return; /* No change, quick exit */ return; /* No change, quick exit */
...@@ -412,12 +412,12 @@ static void omap1_init_ext_clk(struct clk * clk) ...@@ -412,12 +412,12 @@ static void omap1_init_ext_clk(struct clk * clk)
clk-> rate = 96000000 / dsor; clk-> rate = 96000000 / dsor;
} }
static int omap1_clk_use(struct clk *clk) static int omap1_clk_enable(struct clk *clk)
{ {
int ret = 0; int ret = 0;
if (clk->usecount++ == 0) { if (clk->usecount++ == 0) {
if (likely(clk->parent)) { if (likely(clk->parent)) {
ret = omap1_clk_use(clk->parent); ret = omap1_clk_enable(clk->parent);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
clk->usecount--; clk->usecount--;
...@@ -432,7 +432,7 @@ static int omap1_clk_use(struct clk *clk) ...@@ -432,7 +432,7 @@ static int omap1_clk_use(struct clk *clk)
ret = clk->enable(clk); ret = clk->enable(clk);
if (unlikely(ret != 0) && clk->parent) { if (unlikely(ret != 0) && clk->parent) {
omap1_clk_unuse(clk->parent); omap1_clk_disable(clk->parent);
clk->usecount--; clk->usecount--;
} }
} }
...@@ -440,12 +440,12 @@ static int omap1_clk_use(struct clk *clk) ...@@ -440,12 +440,12 @@ static int omap1_clk_use(struct clk *clk)
return ret; return ret;
} }
static void omap1_clk_unuse(struct clk *clk) static void omap1_clk_disable(struct clk *clk)
{ {
if (clk->usecount > 0 && !(--clk->usecount)) { if (clk->usecount > 0 && !(--clk->usecount)) {
clk->disable(clk); clk->disable(clk);
if (likely(clk->parent)) { if (likely(clk->parent)) {
omap1_clk_unuse(clk->parent); omap1_clk_disable(clk->parent);
if (clk->flags & CLOCK_NO_IDLE_PARENT) if (clk->flags & CLOCK_NO_IDLE_PARENT)
if (!cpu_is_omap24xx()) if (!cpu_is_omap24xx())
omap1_clk_allow_idle(clk->parent); omap1_clk_allow_idle(clk->parent);
...@@ -453,7 +453,7 @@ static void omap1_clk_unuse(struct clk *clk) ...@@ -453,7 +453,7 @@ static void omap1_clk_unuse(struct clk *clk)
} }
} }
static int omap1_clk_enable(struct clk *clk) static int omap1_clk_enable_generic(struct clk *clk)
{ {
__u16 regval16; __u16 regval16;
__u32 regval32; __u32 regval32;
...@@ -492,7 +492,7 @@ static int omap1_clk_enable(struct clk *clk) ...@@ -492,7 +492,7 @@ static int omap1_clk_enable(struct clk *clk)
return 0; return 0;
} }
static void omap1_clk_disable(struct clk *clk) static void omap1_clk_disable_generic(struct clk *clk)
{ {
__u16 regval16; __u16 regval16;
__u32 regval32; __u32 regval32;
...@@ -654,8 +654,8 @@ late_initcall(omap1_late_clk_reset); ...@@ -654,8 +654,8 @@ late_initcall(omap1_late_clk_reset);
#endif #endif
static struct clk_functions omap1_clk_functions = { static struct clk_functions omap1_clk_functions = {
.clk_use = omap1_clk_use, .clk_enable = omap1_clk_enable,
.clk_unuse = omap1_clk_unuse, .clk_disable = omap1_clk_disable,
.clk_round_rate = omap1_clk_round_rate, .clk_round_rate = omap1_clk_round_rate,
.clk_set_rate = omap1_clk_set_rate, .clk_set_rate = omap1_clk_set_rate,
}; };
...@@ -780,9 +780,9 @@ int __init omap1_clk_init(void) ...@@ -780,9 +780,9 @@ int __init omap1_clk_init(void)
* Only enable those clocks we will need, let the drivers * Only enable those clocks we will need, let the drivers
* enable other clocks as necessary * enable other clocks as necessary
*/ */
clk_use(&armper_ck.clk); clk_enable(&armper_ck.clk);
clk_use(&armxor_ck.clk); clk_enable(&armxor_ck.clk);
clk_use(&armtim_ck.clk); /* This should be done by timer code */ clk_enable(&armtim_ck.clk); /* This should be done by timer code */
if (cpu_is_omap1510()) if (cpu_is_omap1510())
clk_enable(&arm_gpio_ck); clk_enable(&arm_gpio_ck);
......
arch/arm/mach-omap1/clock.h
View file @ 37b797b2
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#ifndef __ARCH_ARM_MACH_OMAP1_CLOCK_H #ifndef __ARCH_ARM_MACH_OMAP1_CLOCK_H
#define __ARCH_ARM_MACH_OMAP1_CLOCK_H #define __ARCH_ARM_MACH_OMAP1_CLOCK_H
static int omap1_clk_enable(struct clk * clk); static int omap1_clk_enable_generic(struct clk * clk);
static void omap1_clk_disable(struct clk * clk); static void omap1_clk_disable_generic(struct clk * clk);
static void omap1_ckctl_recalc(struct clk * clk); static void omap1_ckctl_recalc(struct clk * clk);
static void omap1_watchdog_recalc(struct clk * clk); static void omap1_watchdog_recalc(struct clk * clk);
static void omap1_ckctl_recalc_dsp_domain(struct clk * clk); static void omap1_ckctl_recalc_dsp_domain(struct clk * clk);
...@@ -30,8 +30,8 @@ static long omap1_round_ext_clk_rate(struct clk * clk, unsigned long rate); ...@@ -30,8 +30,8 @@ static long omap1_round_ext_clk_rate(struct clk * clk, unsigned long rate);
static void omap1_init_ext_clk(struct clk * clk); static void omap1_init_ext_clk(struct clk * clk);
static int omap1_select_table_rate(struct clk * clk, unsigned long rate); static int omap1_select_table_rate(struct clk * clk, unsigned long rate);
static long omap1_round_to_table_rate(struct clk * clk, unsigned long rate); static long omap1_round_to_table_rate(struct clk * clk, unsigned long rate);
static int omap1_clk_use(struct clk *clk); static int omap1_clk_enable(struct clk *clk);
static void omap1_clk_unuse(struct clk *clk); static void omap1_clk_disable(struct clk *clk);
struct mpu_rate { struct mpu_rate {
unsigned long rate; unsigned long rate;
...@@ -152,8 +152,8 @@ static struct clk ck_ref = { ...@@ -152,8 +152,8 @@ static struct clk ck_ref = {
.rate = 12000000, .rate = 12000000,
.flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
ALWAYS_ENABLED, ALWAYS_ENABLED,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk ck_dpll1 = { static struct clk ck_dpll1 = {
...@@ -161,8 +161,8 @@ static struct clk ck_dpll1 = { ...@@ -161,8 +161,8 @@ static struct clk ck_dpll1 = {
.parent = &ck_ref, .parent = &ck_ref,
.flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
RATE_PROPAGATES | ALWAYS_ENABLED, RATE_PROPAGATES | ALWAYS_ENABLED,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct arm_idlect1_clk ck_dpll1out = { static struct arm_idlect1_clk ck_dpll1out = {
...@@ -173,8 +173,8 @@ static struct arm_idlect1_clk ck_dpll1out = { ...@@ -173,8 +173,8 @@ static struct arm_idlect1_clk ck_dpll1out = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_CKOUT_ARM, .enable_bit = EN_CKOUT_ARM,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 12, .idlect_shift = 12,
}; };
...@@ -186,8 +186,8 @@ static struct clk arm_ck = { ...@@ -186,8 +186,8 @@ static struct clk arm_ck = {
RATE_CKCTL | RATE_PROPAGATES | ALWAYS_ENABLED, RATE_CKCTL | RATE_PROPAGATES | ALWAYS_ENABLED,
.rate_offset = CKCTL_ARMDIV_OFFSET, .rate_offset = CKCTL_ARMDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct arm_idlect1_clk armper_ck = { static struct arm_idlect1_clk armper_ck = {
...@@ -200,8 +200,8 @@ static struct arm_idlect1_clk armper_ck = { ...@@ -200,8 +200,8 @@ static struct arm_idlect1_clk armper_ck = {
.enable_bit = EN_PERCK, .enable_bit = EN_PERCK,
.rate_offset = CKCTL_PERDIV_OFFSET, .rate_offset = CKCTL_PERDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 2, .idlect_shift = 2,
}; };
...@@ -213,8 +213,8 @@ static struct clk arm_gpio_ck = { ...@@ -213,8 +213,8 @@ static struct clk arm_gpio_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_GPIOCK, .enable_bit = EN_GPIOCK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct arm_idlect1_clk armxor_ck = { static struct arm_idlect1_clk armxor_ck = {
...@@ -226,8 +226,8 @@ static struct arm_idlect1_clk armxor_ck = { ...@@ -226,8 +226,8 @@ static struct arm_idlect1_clk armxor_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_XORPCK, .enable_bit = EN_XORPCK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 1, .idlect_shift = 1,
}; };
...@@ -241,8 +241,8 @@ static struct arm_idlect1_clk armtim_ck = { ...@@ -241,8 +241,8 @@ static struct arm_idlect1_clk armtim_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_TIMCK, .enable_bit = EN_TIMCK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 9, .idlect_shift = 9,
}; };
...@@ -256,8 +256,8 @@ static struct arm_idlect1_clk armwdt_ck = { ...@@ -256,8 +256,8 @@ static struct arm_idlect1_clk armwdt_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_WDTCK, .enable_bit = EN_WDTCK,
.recalc = &omap1_watchdog_recalc, .recalc = &omap1_watchdog_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 0, .idlect_shift = 0,
}; };
...@@ -272,8 +272,8 @@ static struct clk arminth_ck16xx = { ...@@ -272,8 +272,8 @@ static struct clk arminth_ck16xx = {
* *
* 1510 version is in TC clocks. * 1510 version is in TC clocks.
*/ */
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk dsp_ck = { static struct clk dsp_ck = {
...@@ -285,8 +285,8 @@ static struct clk dsp_ck = { ...@@ -285,8 +285,8 @@ static struct clk dsp_ck = {
.enable_bit = EN_DSPCK, .enable_bit = EN_DSPCK,
.rate_offset = CKCTL_DSPDIV_OFFSET, .rate_offset = CKCTL_DSPDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk dspmmu_ck = { static struct clk dspmmu_ck = {
...@@ -296,8 +296,8 @@ static struct clk dspmmu_ck = { ...@@ -296,8 +296,8 @@ static struct clk dspmmu_ck = {
RATE_CKCTL | ALWAYS_ENABLED, RATE_CKCTL | ALWAYS_ENABLED,
.rate_offset = CKCTL_DSPMMUDIV_OFFSET, .rate_offset = CKCTL_DSPMMUDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk dspper_ck = { static struct clk dspper_ck = {
...@@ -349,8 +349,8 @@ static struct arm_idlect1_clk tc_ck = { ...@@ -349,8 +349,8 @@ static struct arm_idlect1_clk tc_ck = {
CLOCK_IDLE_CONTROL, CLOCK_IDLE_CONTROL,
.rate_offset = CKCTL_TCDIV_OFFSET, .rate_offset = CKCTL_TCDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 6, .idlect_shift = 6,
}; };
...@@ -364,8 +364,8 @@ static struct clk arminth_ck1510 = { ...@@ -364,8 +364,8 @@ static struct clk arminth_ck1510 = {
* *
* 16xx version is in MPU clocks. * 16xx version is in MPU clocks.
*/ */
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk tipb_ck = { static struct clk tipb_ck = {
...@@ -374,8 +374,8 @@ static struct clk tipb_ck = { ...@@ -374,8 +374,8 @@ static struct clk tipb_ck = {
.parent = &tc_ck.clk, .parent = &tc_ck.clk,
.flags = CLOCK_IN_OMAP1510 | ALWAYS_ENABLED, .flags = CLOCK_IN_OMAP1510 | ALWAYS_ENABLED,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk l3_ocpi_ck = { static struct clk l3_ocpi_ck = {
...@@ -386,8 +386,8 @@ static struct clk l3_ocpi_ck = { ...@@ -386,8 +386,8 @@ static struct clk l3_ocpi_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT3, .enable_reg = (void __iomem *)ARM_IDLECT3,
.enable_bit = EN_OCPI_CK, .enable_bit = EN_OCPI_CK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk tc1_ck = { static struct clk tc1_ck = {
...@@ -397,8 +397,8 @@ static struct clk tc1_ck = { ...@@ -397,8 +397,8 @@ static struct clk tc1_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT3, .enable_reg = (void __iomem *)ARM_IDLECT3,
.enable_bit = EN_TC1_CK, .enable_bit = EN_TC1_CK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk tc2_ck = { static struct clk tc2_ck = {
...@@ -408,8 +408,8 @@ static struct clk tc2_ck = { ...@@ -408,8 +408,8 @@ static struct clk tc2_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT3, .enable_reg = (void __iomem *)ARM_IDLECT3,
.enable_bit = EN_TC2_CK, .enable_bit = EN_TC2_CK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk dma_ck = { static struct clk dma_ck = {
...@@ -419,8 +419,8 @@ static struct clk dma_ck = { ...@@ -419,8 +419,8 @@ static struct clk dma_ck = {
.flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
ALWAYS_ENABLED, ALWAYS_ENABLED,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk dma_lcdfree_ck = { static struct clk dma_lcdfree_ck = {
...@@ -428,8 +428,8 @@ static struct clk dma_lcdfree_ck = { ...@@ -428,8 +428,8 @@ static struct clk dma_lcdfree_ck = {
.parent = &tc_ck.clk, .parent = &tc_ck.clk,
.flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct arm_idlect1_clk api_ck = { static struct arm_idlect1_clk api_ck = {
...@@ -441,8 +441,8 @@ static struct arm_idlect1_clk api_ck = { ...@@ -441,8 +441,8 @@ static struct arm_idlect1_clk api_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_APICK, .enable_bit = EN_APICK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 8, .idlect_shift = 8,
}; };
...@@ -455,8 +455,8 @@ static struct arm_idlect1_clk lb_ck = { ...@@ -455,8 +455,8 @@ static struct arm_idlect1_clk lb_ck = {
.enable_reg = (void __iomem *)ARM_IDLECT2, .enable_reg = (void __iomem *)ARM_IDLECT2,
.enable_bit = EN_LBCK, .enable_bit = EN_LBCK,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 4, .idlect_shift = 4,
}; };
...@@ -466,8 +466,8 @@ static struct clk rhea1_ck = { ...@@ -466,8 +466,8 @@ static struct clk rhea1_ck = {
.parent = &tc_ck.clk, .parent = &tc_ck.clk,
.flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk rhea2_ck = { static struct clk rhea2_ck = {
...@@ -475,8 +475,8 @@ static struct clk rhea2_ck = { ...@@ -475,8 +475,8 @@ static struct clk rhea2_ck = {
.parent = &tc_ck.clk, .parent = &tc_ck.clk,
.flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk lcd_ck_16xx = { static struct clk lcd_ck_16xx = {
...@@ -487,8 +487,8 @@ static struct clk lcd_ck_16xx = { ...@@ -487,8 +487,8 @@ static struct clk lcd_ck_16xx = {
.enable_bit = EN_LCDCK, .enable_bit = EN_LCDCK,
.rate_offset = CKCTL_LCDDIV_OFFSET, .rate_offset = CKCTL_LCDDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct arm_idlect1_clk lcd_ck_1510 = { static struct arm_idlect1_clk lcd_ck_1510 = {
...@@ -501,8 +501,8 @@ static struct arm_idlect1_clk lcd_ck_1510 = { ...@@ -501,8 +501,8 @@ static struct arm_idlect1_clk lcd_ck_1510 = {
.enable_bit = EN_LCDCK, .enable_bit = EN_LCDCK,
.rate_offset = CKCTL_LCDDIV_OFFSET, .rate_offset = CKCTL_LCDDIV_OFFSET,
.recalc = &omap1_ckctl_recalc, .recalc = &omap1_ckctl_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}, },
.idlect_shift = 3, .idlect_shift = 3,
}; };
...@@ -518,8 +518,8 @@ static struct clk uart1_1510 = { ...@@ -518,8 +518,8 @@ static struct clk uart1_1510 = {
.enable_bit = 29, /* Chooses between 12MHz and 48MHz */ .enable_bit = 29, /* Chooses between 12MHz and 48MHz */
.set_rate = &omap1_set_uart_rate, .set_rate = &omap1_set_uart_rate,
.recalc = &omap1_uart_recalc, .recalc = &omap1_uart_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct uart_clk uart1_16xx = { static struct uart_clk uart1_16xx = {
...@@ -550,8 +550,8 @@ static struct clk uart2_ck = { ...@@ -550,8 +550,8 @@ static struct clk uart2_ck = {
.enable_bit = 30, /* Chooses between 12MHz and 48MHz */ .enable_bit = 30, /* Chooses between 12MHz and 48MHz */
.set_rate = &omap1_set_uart_rate, .set_rate = &omap1_set_uart_rate,
.recalc = &omap1_uart_recalc, .recalc = &omap1_uart_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk uart3_1510 = { static struct clk uart3_1510 = {
...@@ -565,8 +565,8 @@ static struct clk uart3_1510 = { ...@@ -565,8 +565,8 @@ static struct clk uart3_1510 = {
.enable_bit = 31, /* Chooses between 12MHz and 48MHz */ .enable_bit = 31, /* Chooses between 12MHz and 48MHz */
.set_rate = &omap1_set_uart_rate, .set_rate = &omap1_set_uart_rate,
.recalc = &omap1_uart_recalc, .recalc = &omap1_uart_recalc,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct uart_clk uart3_16xx = { static struct uart_clk uart3_16xx = {
...@@ -593,8 +593,8 @@ static struct clk usb_clko = { /* 6 MHz output on W4_USB_CLKO */ ...@@ -593,8 +593,8 @@ static struct clk usb_clko = { /* 6 MHz output on W4_USB_CLKO */
RATE_FIXED | ENABLE_REG_32BIT, RATE_FIXED | ENABLE_REG_32BIT,
.enable_reg = (void __iomem *)ULPD_CLOCK_CTRL, .enable_reg = (void __iomem *)ULPD_CLOCK_CTRL,
.enable_bit = USB_MCLK_EN_BIT, .enable_bit = USB_MCLK_EN_BIT,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk usb_hhc_ck1510 = { static struct clk usb_hhc_ck1510 = {
...@@ -605,8 +605,8 @@ static struct clk usb_hhc_ck1510 = { ...@@ -605,8 +605,8 @@ static struct clk usb_hhc_ck1510 = {
RATE_FIXED | ENABLE_REG_32BIT, RATE_FIXED | ENABLE_REG_32BIT,
.enable_reg = (void __iomem *)MOD_CONF_CTRL_0, .enable_reg = (void __iomem *)MOD_CONF_CTRL_0,
.enable_bit = USB_HOST_HHC_UHOST_EN, .enable_bit = USB_HOST_HHC_UHOST_EN,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk usb_hhc_ck16xx = { static struct clk usb_hhc_ck16xx = {
...@@ -618,8 +618,8 @@ static struct clk usb_hhc_ck16xx = { ...@@ -618,8 +618,8 @@ static struct clk usb_hhc_ck16xx = {
RATE_FIXED | ENABLE_REG_32BIT, RATE_FIXED | ENABLE_REG_32BIT,
.enable_reg = (void __iomem *)OTG_BASE + 0x08 /* OTG_SYSCON_2 */, .enable_reg = (void __iomem *)OTG_BASE + 0x08 /* OTG_SYSCON_2 */,
.enable_bit = 8 /* UHOST_EN */, .enable_bit = 8 /* UHOST_EN */,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk usb_dc_ck = { static struct clk usb_dc_ck = {
...@@ -629,8 +629,8 @@ static struct clk usb_dc_ck = { ...@@ -629,8 +629,8 @@ static struct clk usb_dc_ck = {
.flags = CLOCK_IN_OMAP16XX | RATE_FIXED, .flags = CLOCK_IN_OMAP16XX | RATE_FIXED,
.enable_reg = (void __iomem *)SOFT_REQ_REG, .enable_reg = (void __iomem *)SOFT_REQ_REG,
.enable_bit = 4, .enable_bit = 4,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk mclk_1510 = { static struct clk mclk_1510 = {
...@@ -638,8 +638,8 @@ static struct clk mclk_1510 = { ...@@ -638,8 +638,8 @@ static struct clk mclk_1510 = {
/* Direct from ULPD, no parent. May be enabled by ext hardware. */ /* Direct from ULPD, no parent. May be enabled by ext hardware. */
.rate = 12000000, .rate = 12000000,
.flags = CLOCK_IN_OMAP1510 | RATE_FIXED, .flags = CLOCK_IN_OMAP1510 | RATE_FIXED,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk mclk_16xx = { static struct clk mclk_16xx = {
...@@ -651,8 +651,8 @@ static struct clk mclk_16xx = { ...@@ -651,8 +651,8 @@ static struct clk mclk_16xx = {
.set_rate = &omap1_set_ext_clk_rate, .set_rate = &omap1_set_ext_clk_rate,
.round_rate = &omap1_round_ext_clk_rate, .round_rate = &omap1_round_ext_clk_rate,
.init = &omap1_init_ext_clk, .init = &omap1_init_ext_clk,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk bclk_1510 = { static struct clk bclk_1510 = {
...@@ -660,8 +660,8 @@ static struct clk bclk_1510 = { ...@@ -660,8 +660,8 @@ static struct clk bclk_1510 = {
/* Direct from ULPD, no parent. May be enabled by ext hardware. */ /* Direct from ULPD, no parent. May be enabled by ext hardware. */
.rate = 12000000, .rate = 12000000,
.flags = CLOCK_IN_OMAP1510 | RATE_FIXED, .flags = CLOCK_IN_OMAP1510 | RATE_FIXED,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk bclk_16xx = { static struct clk bclk_16xx = {
...@@ -673,8 +673,8 @@ static struct clk bclk_16xx = { ...@@ -673,8 +673,8 @@ static struct clk bclk_16xx = {
.set_rate = &omap1_set_ext_clk_rate, .set_rate = &omap1_set_ext_clk_rate,
.round_rate = &omap1_round_ext_clk_rate, .round_rate = &omap1_round_ext_clk_rate,
.init = &omap1_init_ext_clk, .init = &omap1_init_ext_clk,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk mmc1_ck = { static struct clk mmc1_ck = {
...@@ -686,8 +686,8 @@ static struct clk mmc1_ck = { ...@@ -686,8 +686,8 @@ static struct clk mmc1_ck = {
RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT, RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT,
.enable_reg = (void __iomem *)MOD_CONF_CTRL_0, .enable_reg = (void __iomem *)MOD_CONF_CTRL_0,
.enable_bit = 23, .enable_bit = 23,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk mmc2_ck = { static struct clk mmc2_ck = {
...@@ -699,8 +699,8 @@ static struct clk mmc2_ck = { ...@@ -699,8 +699,8 @@ static struct clk mmc2_ck = {
RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT, RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT,
.enable_reg = (void __iomem *)MOD_CONF_CTRL_0, .enable_reg = (void __iomem *)MOD_CONF_CTRL_0,
.enable_bit = 20, .enable_bit = 20,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk virtual_ck_mpu = { static struct clk virtual_ck_mpu = {
...@@ -711,8 +711,8 @@ static struct clk virtual_ck_mpu = { ...@@ -711,8 +711,8 @@ static struct clk virtual_ck_mpu = {
.recalc = &followparent_recalc, .recalc = &followparent_recalc,
.set_rate = &omap1_select_table_rate, .set_rate = &omap1_select_table_rate,
.round_rate = &omap1_round_to_table_rate, .round_rate = &omap1_round_to_table_rate,
.enable = &omap1_clk_enable, .enable = &omap1_clk_enable_generic,
.disable = &omap1_clk_disable, .disable = &omap1_clk_disable_generic,
}; };
static struct clk * onchip_clks[] = { static struct clk * onchip_clks[] = {
......
arch/arm/mach-omap1/serial.c
View file @ 37b797b2
...@@ -146,7 +146,7 @@ void __init omap_serial_init(void) ...@@ -146,7 +146,7 @@ void __init omap_serial_init(void)
if (IS_ERR(uart1_ck)) if (IS_ERR(uart1_ck))
printk("Could not get uart1_ck\n"); printk("Could not get uart1_ck\n");
else { else {
clk_use(uart1_ck); clk_enable(uart1_ck);
if (cpu_is_omap1510()) if (cpu_is_omap1510())
clk_set_rate(uart1_ck, 12000000); clk_set_rate(uart1_ck, 12000000);
} }
...@@ -166,7 +166,7 @@ void __init omap_serial_init(void) ...@@ -166,7 +166,7 @@ void __init omap_serial_init(void)
if (IS_ERR(uart2_ck)) if (IS_ERR(uart2_ck))
printk("Could not get uart2_ck\n"); printk("Could not get uart2_ck\n");
else { else {
clk_use(uart2_ck); clk_enable(uart2_ck);
if (cpu_is_omap1510()) if (cpu_is_omap1510())
clk_set_rate(uart2_ck, 12000000); clk_set_rate(uart2_ck, 12000000);
else else
...@@ -188,7 +188,7 @@ void __init omap_serial_init(void) ...@@ -188,7 +188,7 @@ void __init omap_serial_init(void)
if (IS_ERR(uart3_ck)) if (IS_ERR(uart3_ck))
printk("Could not get uart3_ck\n"); printk("Could not get uart3_ck\n");
else { else {
clk_use(uart3_ck); clk_enable(uart3_ck);
if (cpu_is_omap1510()) if (cpu_is_omap1510())
clk_set_rate(uart3_ck, 12000000); clk_set_rate(uart3_ck, 12000000);
} }
......
arch/arm/mach-omap2/clock.c
View file @ 37b797b2
...@@ -111,7 +111,7 @@ static void omap2_clk_fixed_enable(struct clk *clk) ...@@ -111,7 +111,7 @@ static void omap2_clk_fixed_enable(struct clk *clk)
/* Enables clock without considering parent dependencies or use count /* Enables clock without considering parent dependencies or use count
* REVISIT: Maybe change this to use clk->enable like on omap1? * REVISIT: Maybe change this to use clk->enable like on omap1?
*/ */
static int omap2_clk_enable(struct clk * clk) static int _omap2_clk_enable(struct clk * clk)
{ {
u32 regval32; u32 regval32;
...@@ -150,7 +150,7 @@ static void omap2_clk_fixed_disable(struct clk *clk) ...@@ -150,7 +150,7 @@ static void omap2_clk_fixed_disable(struct clk *clk)
} }
/* Disables clock without considering parent dependencies or use count */ /* Disables clock without considering parent dependencies or use count */
static void omap2_clk_disable(struct clk *clk) static void _omap2_clk_disable(struct clk *clk)
{ {
u32 regval32; u32 regval32;
...@@ -167,23 +167,23 @@ static void omap2_clk_disable(struct clk *clk) ...@@ -167,23 +167,23 @@ static void omap2_clk_disable(struct clk *clk)
__raw_writel(regval32, clk->enable_reg); __raw_writel(regval32, clk->enable_reg);
} }
static int omap2_clk_use(struct clk *clk) static int omap2_clk_enable(struct clk *clk)
{ {
int ret = 0; int ret = 0;
if (clk->usecount++ == 0) { if (clk->usecount++ == 0) {
if (likely((u32)clk->parent)) if (likely((u32)clk->parent))
ret = omap2_clk_use(clk->parent); ret = omap2_clk_enable(clk->parent);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
clk->usecount--; clk->usecount--;
return ret; return ret;
} }
ret = omap2_clk_enable(clk); ret = _omap2_clk_enable(clk);
if (unlikely(ret != 0) && clk->parent) { if (unlikely(ret != 0) && clk->parent) {
omap2_clk_unuse(clk->parent); omap2_clk_disable(clk->parent);
clk->usecount--; clk->usecount--;
} }
} }
...@@ -191,12 +191,12 @@ static int omap2_clk_use(struct clk *clk) ...@@ -191,12 +191,12 @@ static int omap2_clk_use(struct clk *clk)
return ret; return ret;
} }
static void omap2_clk_unuse(struct clk *clk) static void omap2_clk_disable(struct clk *clk)
{ {
if (clk->usecount > 0 && !(--clk->usecount)) { if (clk->usecount > 0 && !(--clk->usecount)) {
omap2_clk_disable(clk); _omap2_clk_disable(clk);
if (likely((u32)clk->parent)) if (likely((u32)clk->parent))
omap2_clk_unuse(clk->parent); omap2_clk_disable(clk->parent);
} }
} }
...@@ -873,7 +873,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) ...@@ -873,7 +873,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
reg = (void __iomem *)src_sel; reg = (void __iomem *)src_sel;
if (clk->usecount > 0) if (clk->usecount > 0)
omap2_clk_disable(clk); _omap2_clk_disable(clk);
/* Set new source value (previous dividers if any in effect) */ /* Set new source value (previous dividers if any in effect) */
reg_val = __raw_readl(reg) & ~(field_mask << src_off); reg_val = __raw_readl(reg) & ~(field_mask << src_off);
...@@ -884,7 +884,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) ...@@ -884,7 +884,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
__raw_writel(0x1, (void __iomem *)&PRCM_CLKCFG_CTRL); __raw_writel(0x1, (void __iomem *)&PRCM_CLKCFG_CTRL);
if (clk->usecount > 0) if (clk->usecount > 0)
omap2_clk_enable(clk); _omap2_clk_enable(clk);
clk->parent = new_parent; clk->parent = new_parent;
...@@ -999,8 +999,6 @@ static int omap2_select_table_rate(struct clk * clk, unsigned long rate) ...@@ -999,8 +999,6 @@ static int omap2_select_table_rate(struct clk * clk, unsigned long rate)
static struct clk_functions omap2_clk_functions = { static struct clk_functions omap2_clk_functions = {
.clk_enable = omap2_clk_enable, .clk_enable = omap2_clk_enable,
.clk_disable = omap2_clk_disable, .clk_disable = omap2_clk_disable,
.clk_use = omap2_clk_use,
.clk_unuse = omap2_clk_unuse,
.clk_round_rate = omap2_clk_round_rate, .clk_round_rate = omap2_clk_round_rate,
.clk_set_rate = omap2_clk_set_rate, .clk_set_rate = omap2_clk_set_rate,
.clk_set_parent = omap2_clk_set_parent, .clk_set_parent = omap2_clk_set_parent,
...@@ -1045,7 +1043,7 @@ static void __init omap2_disable_unused_clocks(void) ...@@ -1045,7 +1043,7 @@ static void __init omap2_disable_unused_clocks(void)
continue; continue;
printk(KERN_INFO "Disabling unused clock \"%s\"\n", ck->name); printk(KERN_INFO "Disabling unused clock \"%s\"\n", ck->name);
omap2_clk_disable(ck); _omap2_clk_disable(ck);
} }
} }
late_initcall(omap2_disable_unused_clocks); late_initcall(omap2_disable_unused_clocks);
...@@ -1120,10 +1118,10 @@ int __init omap2_clk_init(void) ...@@ -1120,10 +1118,10 @@ int __init omap2_clk_init(void)
* Only enable those clocks we will need, let the drivers * Only enable those clocks we will need, let the drivers
* enable other clocks as necessary * enable other clocks as necessary
*/ */
clk_use(&sync_32k_ick); clk_enable(&sync_32k_ick);
clk_use(&omapctrl_ick); clk_enable(&omapctrl_ick);
if (cpu_is_omap2430()) if (cpu_is_omap2430())
clk_use(&sdrc_ick); clk_enable(&sdrc_ick);
return 0; return 0;
} }
arch/arm/mach-omap2/clock.h
View file @ 37b797b2
...@@ -24,7 +24,7 @@ static void omap2_propagate_rate(struct clk * clk); ...@@ -24,7 +24,7 @@ static void omap2_propagate_rate(struct clk * clk);
static void omap2_mpu_recalc(struct clk * clk); static void omap2_mpu_recalc(struct clk * clk);
static int omap2_select_table_rate(struct clk * clk, unsigned long rate); static int omap2_select_table_rate(struct clk * clk, unsigned long rate);
static long omap2_round_to_table_rate(struct clk * clk, unsigned long rate); static long omap2_round_to_table_rate(struct clk * clk, unsigned long rate);
static void omap2_clk_unuse(struct clk *clk); static void omap2_clk_disable(struct clk *clk);
static void omap2_sys_clk_recalc(struct clk * clk); static void omap2_sys_clk_recalc(struct clk * clk);
static u32 omap2_clksel_to_divisor(u32 div_sel, u32 field_val); static u32 omap2_clksel_to_divisor(u32 div_sel, u32 field_val);
static u32 omap2_clksel_get_divisor(struct clk *clk); static u32 omap2_clksel_get_divisor(struct clk *clk);
...@@ -859,7 +859,7 @@ static struct clk core_l3_ck = { /* Used for ick and fck, interconnect */ ...@@ -859,7 +859,7 @@ static struct clk core_l3_ck = { /* Used for ick and fck, interconnect */
static struct clk usb_l4_ick = { /* FS-USB interface clock */ static struct clk usb_l4_ick = { /* FS-USB interface clock */
.name = "usb_l4_ick", .name = "usb_l4_ick",
.parent = &core_ck, .parent = &core_l3_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
RATE_CKCTL | CM_CORE_SEL1 | DELAYED_APP | RATE_CKCTL | CM_CORE_SEL1 | DELAYED_APP |
CONFIG_PARTICIPANT, CONFIG_PARTICIPANT,
...@@ -1045,7 +1045,7 @@ static struct clk gpt1_ick = { ...@@ -1045,7 +1045,7 @@ static struct clk gpt1_ick = {
.name = "gpt1_ick", .name = "gpt1_ick",
.parent = &l4_ck, .parent = &l4_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
.enable_reg = (void __iomem *)&CM_ICLKEN_WKUP, /* Bit4 */ .enable_reg = (void __iomem *)&CM_ICLKEN_WKUP, /* Bit0 */
.enable_bit = 0, .enable_bit = 0,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
}; };
...@@ -1055,7 +1055,7 @@ static struct clk gpt1_fck = { ...@@ -1055,7 +1055,7 @@ static struct clk gpt1_fck = {
.parent = &func_32k_ck, .parent = &func_32k_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
CM_WKUP_SEL1, CM_WKUP_SEL1,
.enable_reg = (void __iomem *)&CM_FCLKEN_WKUP, .enable_reg = (void __iomem *)&CM_FCLKEN_WKUP, /* Bit0 */
.enable_bit = 0, .enable_bit = 0,
.src_offset = 0, .src_offset = 0,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
...@@ -1065,7 +1065,7 @@ static struct clk gpt2_ick = { ...@@ -1065,7 +1065,7 @@ static struct clk gpt2_ick = {
.name = "gpt2_ick", .name = "gpt2_ick",
.parent = &l4_ck, .parent = &l4_ck,
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
.enable_reg = (void __iomem *)&CM_ICLKEN1_CORE, /* bit4 */ .enable_reg = (void __iomem *)&CM_ICLKEN1_CORE, /* Bit4 */
.enable_bit = 0, .enable_bit = 0,
.recalc = &omap2_followparent_recalc, .recalc = &omap2_followparent_recalc,
}; };
...@@ -1839,7 +1839,7 @@ static struct clk usb_fck = { ...@@ -1839,7 +1839,7 @@ static struct clk usb_fck = {
static struct clk usbhs_ick = { static struct clk usbhs_ick = {
.name = "usbhs_ick", .name = "usbhs_ick",
.parent = &l4_ck, .parent = &core_l3_ck,
.flags = CLOCK_IN_OMAP243X, .flags = CLOCK_IN_OMAP243X,
.enable_reg = (void __iomem *)&CM_ICLKEN2_CORE, .enable_reg = (void __iomem *)&CM_ICLKEN2_CORE,
.enable_bit = 6, .enable_bit = 6,
......
arch/arm/mach-omap2/serial.c
View file @ 37b797b2
...@@ -119,14 +119,14 @@ void __init omap_serial_init() ...@@ -119,14 +119,14 @@ void __init omap_serial_init()
if (IS_ERR(uart1_ick)) if (IS_ERR(uart1_ick))
printk("Could not get uart1_ick\n"); printk("Could not get uart1_ick\n");
else { else {
clk_use(uart1_ick); clk_enable(uart1_ick);
} }
uart1_fck = clk_get(NULL, "uart1_fck"); uart1_fck = clk_get(NULL, "uart1_fck");
if (IS_ERR(uart1_fck)) if (IS_ERR(uart1_fck))
printk("Could not get uart1_fck\n"); printk("Could not get uart1_fck\n");
else { else {
clk_use(uart1_fck); clk_enable(uart1_fck);
} }
break; break;
case 1: case 1:
...@@ -134,14 +134,14 @@ void __init omap_serial_init() ...@@ -134,14 +134,14 @@ void __init omap_serial_init()
if (IS_ERR(uart2_ick)) if (IS_ERR(uart2_ick))
printk("Could not get uart2_ick\n"); printk("Could not get uart2_ick\n");
else { else {
clk_use(uart2_ick); clk_enable(uart2_ick);
} }
uart2_fck = clk_get(NULL, "uart2_fck"); uart2_fck = clk_get(NULL, "uart2_fck");
if (IS_ERR(uart2_fck)) if (IS_ERR(uart2_fck))
printk("Could not get uart2_fck\n"); printk("Could not get uart2_fck\n");
else { else {
clk_use(uart2_fck); clk_enable(uart2_fck);
} }
break; break;
case 2: case 2:
...@@ -149,14 +149,14 @@ void __init omap_serial_init() ...@@ -149,14 +149,14 @@ void __init omap_serial_init()
if (IS_ERR(uart3_ick)) if (IS_ERR(uart3_ick))
printk("Could not get uart3_ick\n"); printk("Could not get uart3_ick\n");
else { else {
clk_use(uart3_ick); clk_enable(uart3_ick);
} }
uart3_fck = clk_get(NULL, "uart3_fck"); uart3_fck = clk_get(NULL, "uart3_fck");
if (IS_ERR(uart3_fck)) if (IS_ERR(uart3_fck))
printk("Could not get uart3_fck\n"); printk("Could not get uart3_fck\n");
else { else {
clk_use(uart3_fck); clk_enable(uart3_fck);
} }
break; break;
} }
......
arch/arm/mach-omap2/timer-gp.c
View file @ 37b797b2
...@@ -104,7 +104,7 @@ static void __init omap2_gp_timer_init(void) ...@@ -104,7 +104,7 @@ static void __init omap2_gp_timer_init(void)
if (IS_ERR(sys_ck)) if (IS_ERR(sys_ck))
printk(KERN_ERR "Could not get sys_ck\n"); printk(KERN_ERR "Could not get sys_ck\n");
else { else {
clk_use(sys_ck); clk_enable(sys_ck);
tick_period = clk_get_rate(sys_ck) / 100; tick_period = clk_get_rate(sys_ck) / 100;
clk_put(sys_ck); clk_put(sys_ck);
} }
......
arch/arm/plat-omap/clock.c
View file @ 37b797b2
...@@ -34,7 +34,7 @@ DEFINE_SPINLOCK(clockfw_lock); ...@@ -34,7 +34,7 @@ DEFINE_SPINLOCK(clockfw_lock);
static struct clk_functions *arch_clock; static struct clk_functions *arch_clock;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Standard clock functions defined in asm/hardware/clock.h * Standard clock functions defined in include/linux/clk.h
*-------------------------------------------------------------------------*/ *-------------------------------------------------------------------------*/
struct clk * clk_get(struct device *dev, const char *id) struct clk * clk_get(struct device *dev, const char *id)
...@@ -60,12 +60,8 @@ int clk_enable(struct clk *clk) ...@@ -60,12 +60,8 @@ int clk_enable(struct clk *clk)
int ret = 0; int ret = 0;
spin_lock_irqsave(&clockfw_lock, flags); spin_lock_irqsave(&clockfw_lock, flags);
if (clk->enable) if (arch_clock->clk_enable)
ret = clk->enable(clk);
else if (arch_clock->clk_enable)
ret = arch_clock->clk_enable(clk); ret = arch_clock->clk_enable(clk);
else
printk(KERN_ERR "Could not enable clock %s\n", clk->name);
spin_unlock_irqrestore(&clockfw_lock, flags); spin_unlock_irqrestore(&clockfw_lock, flags);
return ret; return ret;
...@@ -77,41 +73,12 @@ void clk_disable(struct clk *clk) ...@@ -77,41 +73,12 @@ void clk_disable(struct clk *clk)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&clockfw_lock, flags); spin_lock_irqsave(&clockfw_lock, flags);
if (clk->disable) if (arch_clock->clk_disable)
clk->disable(clk);
else if (arch_clock->clk_disable)
arch_clock->clk_disable(clk); arch_clock->clk_disable(clk);
else
printk(KERN_ERR "Could not disable clock %s\n", clk->name);
spin_unlock_irqrestore(&clockfw_lock, flags); spin_unlock_irqrestore(&clockfw_lock, flags);
} }
EXPORT_SYMBOL(clk_disable); EXPORT_SYMBOL(clk_disable);
int clk_use(struct clk *clk)
{
unsigned long flags;
int ret = 0;
spin_lock_irqsave(&clockfw_lock, flags);
if (arch_clock->clk_use)
ret = arch_clock->clk_use(clk);
spin_unlock_irqrestore(&clockfw_lock, flags);
return ret;
}
EXPORT_SYMBOL(clk_use);
void clk_unuse(struct clk *clk)
{
unsigned long flags;
spin_lock_irqsave(&clockfw_lock, flags);
if (arch_clock->clk_unuse)
arch_clock->clk_unuse(clk);
spin_unlock_irqrestore(&clockfw_lock, flags);
}
EXPORT_SYMBOL(clk_unuse);
int clk_get_usecount(struct clk *clk) int clk_get_usecount(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
...@@ -146,7 +113,7 @@ void clk_put(struct clk *clk) ...@@ -146,7 +113,7 @@ void clk_put(struct clk *clk)
EXPORT_SYMBOL(clk_put); EXPORT_SYMBOL(clk_put);
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Optional clock functions defined in asm/hardware/clock.h * Optional clock functions defined in include/linux/clk.h
*-------------------------------------------------------------------------*/ *-------------------------------------------------------------------------*/
long clk_round_rate(struct clk *clk, unsigned long rate) long clk_round_rate(struct clk *clk, unsigned long rate)
......
arch/arm/plat-omap/gpio.c
View file @ 37b797b2
...@@ -853,19 +853,19 @@ static int __init _omap_gpio_init(void) ...@@ -853,19 +853,19 @@ static int __init _omap_gpio_init(void)
if (IS_ERR(gpio_ick)) if (IS_ERR(gpio_ick))
printk("Could not get arm_gpio_ck\n"); printk("Could not get arm_gpio_ck\n");
else else
clk_use(gpio_ick); clk_enable(gpio_ick);
} }
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
gpio_ick = clk_get(NULL, "gpios_ick"); gpio_ick = clk_get(NULL, "gpios_ick");
if (IS_ERR(gpio_ick)) if (IS_ERR(gpio_ick))
printk("Could not get gpios_ick\n"); printk("Could not get gpios_ick\n");
else else
clk_use(gpio_ick); clk_enable(gpio_ick);
gpio_fck = clk_get(NULL, "gpios_fck"); gpio_fck = clk_get(NULL, "gpios_fck");
if (IS_ERR(gpio_ick)) if (IS_ERR(gpio_ick))
printk("Could not get gpios_fck\n"); printk("Could not get gpios_fck\n");
else else
clk_use(gpio_fck); clk_enable(gpio_fck);
} }
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
......
arch/arm/plat-omap/mcbsp.c
View file @ 37b797b2
...@@ -190,11 +190,11 @@ static int omap_mcbsp_check(unsigned int id) ...@@ -190,11 +190,11 @@ static int omap_mcbsp_check(unsigned int id)
static void omap_mcbsp_dsp_request(void) static void omap_mcbsp_dsp_request(void)
{ {
if (cpu_is_omap1510() || cpu_is_omap16xx()) { if (cpu_is_omap1510() || cpu_is_omap16xx()) {
clk_use(mcbsp_dsp_ck); clk_enable(mcbsp_dsp_ck);
clk_use(mcbsp_api_ck); clk_enable(mcbsp_api_ck);
/* enable 12MHz clock to mcbsp 1 & 3 */ /* enable 12MHz clock to mcbsp 1 & 3 */
clk_use(mcbsp_dspxor_ck); clk_enable(mcbsp_dspxor_ck);
/* /*
* DSP external peripheral reset * DSP external peripheral reset
...@@ -208,9 +208,9 @@ static void omap_mcbsp_dsp_request(void) ...@@ -208,9 +208,9 @@ static void omap_mcbsp_dsp_request(void)
static void omap_mcbsp_dsp_free(void) static void omap_mcbsp_dsp_free(void)
{ {
if (cpu_is_omap1510() || cpu_is_omap16xx()) { if (cpu_is_omap1510() || cpu_is_omap16xx()) {
clk_unuse(mcbsp_dspxor_ck); clk_disable(mcbsp_dspxor_ck);
clk_unuse(mcbsp_dsp_ck); clk_disable(mcbsp_dsp_ck);
clk_unuse(mcbsp_api_ck); clk_disable(mcbsp_api_ck);
} }
} }
......
arch/arm/plat-omap/ocpi.c
View file @ 37b797b2
...@@ -88,7 +88,7 @@ static int __init omap_ocpi_init(void) ...@@ -88,7 +88,7 @@ static int __init omap_ocpi_init(void)
if (IS_ERR(ocpi_ck)) if (IS_ERR(ocpi_ck))
return PTR_ERR(ocpi_ck); return PTR_ERR(ocpi_ck);
clk_use(ocpi_ck); clk_enable(ocpi_ck);
ocpi_enable(); ocpi_enable();
printk("OMAP OCPI interconnect driver loaded\n"); printk("OMAP OCPI interconnect driver loaded\n");
...@@ -102,7 +102,7 @@ static void __exit omap_ocpi_exit(void) ...@@ -102,7 +102,7 @@ static void __exit omap_ocpi_exit(void)
if (!cpu_is_omap16xx()) if (!cpu_is_omap16xx())
return; return;
clk_unuse(ocpi_ck); clk_disable(ocpi_ck);
clk_put(ocpi_ck); clk_put(ocpi_ck);
} }
......
include/asm-arm/arch-omap/clock.h
View file @ 37b797b2
...@@ -38,8 +38,6 @@ struct clk { ...@@ -38,8 +38,6 @@ struct clk {
struct clk_functions { struct clk_functions {
int (*clk_enable)(struct clk *clk); int (*clk_enable)(struct clk *clk);
void (*clk_disable)(struct clk *clk); void (*clk_disable)(struct clk *clk);
int (*clk_use)(struct clk *clk);
void (*clk_unuse)(struct clk *clk);
long (*clk_round_rate)(struct clk *clk, unsigned long rate); long (*clk_round_rate)(struct clk *clk, unsigned long rate);
int (*clk_set_rate)(struct clk *clk, unsigned long rate); int (*clk_set_rate)(struct clk *clk, unsigned long rate);
int (*clk_set_parent)(struct clk *clk, struct clk *parent); int (*clk_set_parent)(struct clk *clk, struct clk *parent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7