Skip to content

Commit

Permalink
Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-…
Browse files Browse the repository at this point in the history
…for-linus
  • Loading branch information
Tony Lindgren committed May 20, 2010
2 parents c8f626f + 59dd722 commit 4fa73a1
Show file tree
Hide file tree
Showing 41 changed files with 2,099 additions and 1,456 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap1/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ int omap1_clk_set_rate(struct clk *clk, unsigned long rate)

#ifdef CONFIG_OMAP_RESET_CLOCKS

void __init omap1_clk_disable_unused(struct clk *clk)
void omap1_clk_disable_unused(struct clk *clk)
{
__u32 regval32;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap1/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern long omap1_clk_round_rate_ckctl_arm(struct clk *clk, unsigned long rate);
extern unsigned long omap1_watchdog_recalc(struct clk *clk);

#ifdef CONFIG_OMAP_RESET_CLOCKS
extern void __init omap1_clk_disable_unused(struct clk *clk);
extern void omap1_clk_disable_unused(struct clk *clk);
#else
#define omap1_clk_disable_unused NULL
#endif
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/clkt2xxx_apll.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask)

static int omap2_clk_apll96_enable(struct clk *clk)
{
return omap2_clk_apll_enable(clk, OMAP24XX_ST_96M_APLL);
return omap2_clk_apll_enable(clk, OMAP24XX_ST_96M_APLL_MASK);
}

static int omap2_clk_apll54_enable(struct clk *clk)
{
return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL);
return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL_MASK);
}

/* Stop APLL */
Expand Down
17 changes: 4 additions & 13 deletions arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,13 @@ long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
{
const struct prcm_config *ptr;
long highest_rate;
long sys_ck_rate;

sys_ck_rate = clk_get_rate(sclk);

highest_rate = -EINVAL;

for (ptr = rate_table; ptr->mpu_speed; ptr++) {
if (!(ptr->flags & cpu_mask))
continue;
if (ptr->xtal_speed != sys_ck_rate)
if (ptr->xtal_speed != sclk->rate)
continue;

highest_rate = ptr->mpu_speed;
Expand All @@ -96,15 +93,12 @@ int omap2_select_table_rate(struct clk *clk, unsigned long rate)
const struct prcm_config *prcm;
unsigned long found_speed = 0;
unsigned long flags;
long sys_ck_rate;

sys_ck_rate = clk_get_rate(sclk);

for (prcm = rate_table; prcm->mpu_speed; prcm++) {
if (!(prcm->flags & cpu_mask))
continue;

if (prcm->xtal_speed != sys_ck_rate)
if (prcm->xtal_speed != sclk->rate)
continue;

if (prcm->mpu_speed <= rate) {
Expand Down Expand Up @@ -181,19 +175,16 @@ static struct cpufreq_frequency_table *freq_table;
void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
{
const struct prcm_config *prcm;
long sys_ck_rate;
int i = 0;
int tbl_sz = 0;

if (!cpu_is_omap24xx())
return;

sys_ck_rate = clk_get_rate(sclk);

for (prcm = rate_table; prcm->mpu_speed; prcm++) {
if (!(prcm->flags & cpu_mask))
continue;
if (prcm->xtal_speed != sys_ck_rate)
if (prcm->xtal_speed != sclk->rate)
continue;

/* don't put bypass rates in table */
Expand Down Expand Up @@ -226,7 +217,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
for (prcm = rate_table; prcm->mpu_speed; prcm++) {
if (!(prcm->flags & cpu_mask))
continue;
if (prcm->xtal_speed != sys_ck_rate)
if (prcm->xtal_speed != sclk->rate)
continue;

/* don't put bypass rates in table */
Expand Down
Loading

0 comments on commit 4fa73a1

Please sign in to comment.