aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2012-08-28 19:18:52 -0400
committerTony Lindgren <tony@atomide.com>2012-09-10 19:33:59 -0400
commit8aa8a9037a814b3006fb87cc03d925a96a197956 (patch)
tree43e58d46428d3b680862d4f4a71b6736c776a120 /arch
parentb61968e5cfbc511cefb7567e2d3e2fb722b35c61 (diff)
ARM: OMAP1: remove the crystal type tag parsing
The omap1 crystal setting uses the OMAP custom tags. Those tags are not used in upstream kernel and therefore the crystal type is never set by the tag parsing code on upstream kernels. Remove the crystal tag parsing code. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/clock_data.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index c007d80dfb62..6a32b9b0dc30 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -25,7 +25,6 @@
25#include <plat/clock.h> 25#include <plat/clock.h>
26#include <plat/cpu.h> 26#include <plat/cpu.h>
27#include <plat/clkdev_omap.h> 27#include <plat/clkdev_omap.h>
28#include <plat/board.h>
29#include <plat/sram.h> /* for omap_sram_reprogram_clock() */ 28#include <plat/sram.h> /* for omap_sram_reprogram_clock() */
30 29
31#include <mach/hardware.h> 30#include <mach/hardware.h>
@@ -788,7 +787,6 @@ u32 cpu_mask;
788int __init omap1_clk_init(void) 787int __init omap1_clk_init(void)
789{ 788{
790 struct omap_clk *c; 789 struct omap_clk *c;
791 const struct omap_clock_config *info;
792 int crystal_type = 0; /* Default 12 MHz */ 790 int crystal_type = 0; /* Default 12 MHz */
793 u32 reg; 791 u32 reg;
794 792
@@ -837,12 +835,6 @@ int __init omap1_clk_init(void)
837 ck_dpll1_p = clk_get(NULL, "ck_dpll1"); 835 ck_dpll1_p = clk_get(NULL, "ck_dpll1");
838 ck_ref_p = clk_get(NULL, "ck_ref"); 836 ck_ref_p = clk_get(NULL, "ck_ref");
839 837
840 info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
841 if (info != NULL) {
842 if (!cpu_is_omap15xx())
843 crystal_type = info->system_clock_type;
844 }
845
846 if (cpu_is_omap7xx()) 838 if (cpu_is_omap7xx())
847 ck_ref.rate = 13000000; 839 ck_ref.rate = 13000000;
848 if (cpu_is_omap16xx() && crystal_type == 2) 840 if (cpu_is_omap16xx() && crystal_type == 2)