From: Paul Walmsley Date: Tue, 4 Dec 2007 09:26:07 +0000 (-0700) Subject: 3430 clock: 3430 clock: combine div2_rates X-Git-Tag: v2.6.24-omap1~121 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=11516e3ecdf8b475390fd5d905ed148c35b5ee4c;p=linux-2.6-omap-h63xx.git 3430 clock: 3430 clock: combine div2_rates Several 3430 clocks have separate, identical clksel_rate structures that pass through the full parent rate, or divide it by 2 - combine these structures. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 6b515442933..075a2fad367 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -151,14 +151,14 @@ static struct clk osc_sys_ck = { .recalc = &omap2_clksel_recalc, }; -static const struct clksel_rate sys_osc_rates[] = { +static const struct clksel_rate div2_rates[] = { { .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE }, { .div = 2, .val = 2, .flags = RATE_IN_343X }, { .div = 0 } }; static const struct clksel sys_clksel[] = { - { .parent = &osc_sys_ck, .rates = sys_osc_rates }, + { .parent = &osc_sys_ck, .rates = div2_rates }, { .parent = NULL } }; @@ -307,12 +307,6 @@ static const struct clksel_rate div16_dpll_rates[] = { { .div = 0 } }; -static const struct clksel_rate div2_rates[] = { - { .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE }, - { .div = 2, .val = 2, .flags = RATE_IN_343X }, - { .div = 0 }, -}; - static const struct clksel div2_dpll3m2_clksel[] = { { .parent = &dpll3_ck, .rates = div2_rates }, { .parent = NULL } @@ -1362,14 +1356,8 @@ static struct clk ssi_ick = { /* REVISIT: Technically the TRM claims that this is CORE_CLK based, * but l4_ick makes more sense to me */ -static const struct clksel_rate usb_l4_l4_rates[] = { - { .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE }, - { .div = 2, .val = 2, .flags = RATE_IN_343X }, - { .div = 0 } -}; - static const struct clksel usb_l4_clksel[] = { - { .parent = &l4_ick, .rates = usb_l4_l4_rates }, + { .parent = &l4_ick, .rates = div2_rates }, { .parent = NULL }, };