From 56928e7781df486724549307f83d4f22c0d87bf7 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 23 Mar 2009 10:07:48 +0100 Subject: [PATCH] --- yaml --- r: 148971 b: refs/heads/master c: d16caf69ce26dbd2ec3ae4e0072c2a60f1896c89 h: refs/heads/master i: 148969: 76eca32b46385684711eea60999e037ad2d6a423 148967: 125673ccebdba041309ae81cb6e2b7294348dadf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/clock-imx35.c | 33 ++++----------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 287062fc7000..9e255607ec3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54df526819d3bfbc1af3f13aed7a3f9b9fdbdd04 +refs/heads/master: d16caf69ce26dbd2ec3ae4e0072c2a60f1896c89 diff --git a/trunk/arch/arm/mach-mx3/clock-imx35.c b/trunk/arch/arm/mach-mx3/clock-imx35.c index 53a112d4e04a..db4aba7e5c6f 100644 --- a/trunk/arch/arm/mach-mx3/clock-imx35.c +++ b/trunk/arch/arm/mach-mx3/clock-imx35.c @@ -147,34 +147,16 @@ static struct arm_ahb_div clk_consumer[] = { { .arm = 0, .ahb = 0, .sel = 0}, }; -static struct arm_ahb_div clk_automotive[] = { - { .arm = 1, .ahb = 3, .sel = 0}, - { .arm = 1, .ahb = 2, .sel = 1}, - { .arm = 2, .ahb = 1, .sel = 1}, - { .arm = 0, .ahb = 0, .sel = 0}, - { .arm = 1, .ahb = 6, .sel = 0}, - { .arm = 1, .ahb = 4, .sel = 1}, - { .arm = 2, .ahb = 2, .sel = 1}, - { .arm = 0, .ahb = 0, .sel = 0}, -}; - static unsigned long get_rate_arm(void) { unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0); struct arm_ahb_div *aad; unsigned long fref = get_rate_mpll(); - if (pdr0 & 1) { - /* consumer path */ - aad = &clk_consumer[(pdr0 >> 16) & 0xf]; - if (aad->sel) - fref = fref * 2 / 3; - } else { - /* auto path */ - aad = &clk_automotive[(pdr0 >> 9) & 0x7]; - if (aad->sel) - fref = fref * 3 / 4; - } + aad = &clk_consumer[(pdr0 >> 16) & 0xf]; + if (aad->sel) + fref = fref * 2 / 3; + return fref / aad->arm; } @@ -184,12 +166,7 @@ static unsigned long get_rate_ahb(struct clk *clk) struct arm_ahb_div *aad; unsigned long fref = get_rate_mpll(); - if (pdr0 & 1) - /* consumer path */ - aad = &clk_consumer[(pdr0 >> 16) & 0xf]; - else - /* auto path */ - aad = &clk_automotive[(pdr0 >> 9) & 0x7]; + aad = &clk_consumer[(pdr0 >> 16) & 0xf]; return fref / aad->ahb; }