aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c6
-rw-r--r--arch/arm/mach-omap2/clock34xx.c18
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 845b478ebeee..8ecd1751a3d8 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -512,9 +512,6 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
512 struct prcm_config *ptr; 512 struct prcm_config *ptr;
513 long highest_rate; 513 long highest_rate;
514 514
515 if (clk != &virt_prcm_set)
516 return -EINVAL;
517
518 highest_rate = -EINVAL; 515 highest_rate = -EINVAL;
519 516
520 for (ptr = rate_table; ptr->mpu_speed; ptr++) { 517 for (ptr = rate_table; ptr->mpu_speed; ptr++) {
@@ -540,9 +537,6 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate)
540 unsigned long found_speed = 0; 537 unsigned long found_speed = 0;
541 unsigned long flags; 538 unsigned long flags;
542 539
543 if (clk != &virt_prcm_set)
544 return -EINVAL;
545
546 for (prcm = rate_table; prcm->mpu_speed; prcm++) { 540 for (prcm = rate_table; prcm->mpu_speed; prcm++) {
547 if (!(prcm->flags & cpu_mask)) 541 if (!(prcm->flags & cpu_mask))
548 continue; 542 continue;
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index ecbb5cd8eec8..523978a58d4e 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -520,9 +520,6 @@ static int _omap3_noncore_dpll_lock(struct clk *clk)
520 u8 ai; 520 u8 ai;
521 int r; 521 int r;
522 522
523 if (clk == &dpll3_ck)
524 return -EINVAL;
525
526 pr_debug("clock: locking DPLL %s\n", clk->name); 523 pr_debug("clock: locking DPLL %s\n", clk->name);
527 524
528 ai = omap3_dpll_autoidle_read(clk); 525 ai = omap3_dpll_autoidle_read(clk);
@@ -557,9 +554,6 @@ static int _omap3_noncore_dpll_bypass(struct clk *clk)
557 int r; 554 int r;
558 u8 ai; 555 u8 ai;
559 556
560 if (clk == &dpll3_ck)
561 return -EINVAL;
562
563 if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS))) 557 if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS)))
564 return -EINVAL; 558 return -EINVAL;
565 559
@@ -593,9 +587,6 @@ static int _omap3_noncore_dpll_stop(struct clk *clk)
593{ 587{
594 u8 ai; 588 u8 ai;
595 589
596 if (clk == &dpll3_ck)
597 return -EINVAL;
598
599 if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP))) 590 if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP)))
600 return -EINVAL; 591 return -EINVAL;
601 592
@@ -632,9 +623,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
632 int r; 623 int r;
633 struct dpll_data *dd; 624 struct dpll_data *dd;
634 625
635 if (clk == &dpll3_ck)
636 return -EINVAL;
637
638 dd = clk->dpll_data; 626 dd = clk->dpll_data;
639 if (!dd) 627 if (!dd)
640 return -EINVAL; 628 return -EINVAL;
@@ -669,9 +657,6 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
669 */ 657 */
670static void omap3_noncore_dpll_disable(struct clk *clk) 658static void omap3_noncore_dpll_disable(struct clk *clk)
671{ 659{
672 if (clk == &dpll3_ck)
673 return;
674
675 _omap3_noncore_dpll_stop(clk); 660 _omap3_noncore_dpll_stop(clk);
676} 661}
677 662
@@ -844,9 +829,6 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)
844 if (!clk || !rate) 829 if (!clk || !rate)
845 return -EINVAL; 830 return -EINVAL;
846 831
847 if (clk != &dpll3_m2_ck)
848 return -EINVAL;
849
850 validrate = omap2_clksel_round_rate_div(clk, rate, &new_div); 832 validrate = omap2_clksel_round_rate_div(clk, rate, &new_div);
851 if (validrate != rate) 833 if (validrate != rate)
852 return -EINVAL; 834 return -EINVAL;