From bcc919983e8dc579470deaa5e2769cfee6fddd21 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Wed, 29 Aug 2012 02:18:52 +0300 Subject: [PATCH] --- yaml --- r: 326497 b: refs/heads/master c: 8aa8a9037a814b3006fb87cc03d925a96a197956 h: refs/heads/master i: 326495: 554e21e4f86adffd910afbb66d541af560459ee6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/clock_data.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f1af5debc694..69817eb7065b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b61968e5cfbc511cefb7567e2d3e2fb722b35c61 +refs/heads/master: 8aa8a9037a814b3006fb87cc03d925a96a197956 diff --git a/trunk/arch/arm/mach-omap1/clock_data.c b/trunk/arch/arm/mach-omap1/clock_data.c index c007d80dfb62..6a32b9b0dc30 100644 --- a/trunk/arch/arm/mach-omap1/clock_data.c +++ b/trunk/arch/arm/mach-omap1/clock_data.c @@ -25,7 +25,6 @@ #include #include #include -#include #include /* for omap_sram_reprogram_clock() */ #include @@ -788,7 +787,6 @@ u32 cpu_mask; int __init omap1_clk_init(void) { struct omap_clk *c; - const struct omap_clock_config *info; int crystal_type = 0; /* Default 12 MHz */ u32 reg; @@ -837,12 +835,6 @@ int __init omap1_clk_init(void) ck_dpll1_p = clk_get(NULL, "ck_dpll1"); ck_ref_p = clk_get(NULL, "ck_ref"); - info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config); - if (info != NULL) { - if (!cpu_is_omap15xx()) - crystal_type = info->system_clock_type; - } - if (cpu_is_omap7xx()) ck_ref.rate = 13000000; if (cpu_is_omap16xx() && crystal_type == 2)