diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-04 10:27:32 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-04 10:27:32 +0000 |
| commit | e0cedcbc754caa32c00a447a8d1c360954adda20 (patch) | |
| tree | 9fcb91f9f33e47163cf1407eb9b11e8ba7bb4ee5 | |
| parent | d0c041687a405097b319e2c4df114837b10e6a95 (diff) | |
use constant for clock values (closes: #2306)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8607 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar7-2.6/files/arch/mips/ar7/clock.c | 30 | ||||
| -rw-r--r-- | target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h | 5 |
2 files changed, 18 insertions, 17 deletions
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/clock.c b/target/linux/ar7-2.6/files/arch/mips/ar7/clock.c index a8b70b023..f51c641a3 100644 --- a/target/linux/ar7-2.6/files/arch/mips/ar7/clock.c +++ b/target/linux/ar7-2.6/files/arch/mips/ar7/clock.c @@ -92,10 +92,6 @@ struct tnetd7200_clocks { struct tnetd7200_clock usb; } __attribute__ ((packed)); -int ar7_afe_clock = 35328000; -int ar7_ref_clock = 25000000; -int ar7_xtal_clock = 24000000; - int ar7_cpu_clock = 150000000; EXPORT_SYMBOL(ar7_cpu_clock); int ar7_bus_clock = 125000000; @@ -182,7 +178,7 @@ static int tnetd7300_get_clock(u32 shift, struct tnetd7300_clock *clock, u32 *bootcr, u32 bus_clock) { int product; - int base_clock = ar7_ref_clock; + int base_clock = AR7_REF_CLOCK; u32 ctrl = clock->ctrl; u32 pll = clock->pll; int prediv = ((ctrl & PREDIV_MASK) >> PREDIV_SHIFT) + 1; @@ -195,10 +191,10 @@ static int tnetd7300_get_clock(u32 shift, struct tnetd7300_clock *clock, base_clock = bus_clock; break; case BOOT_PLL_SOURCE_REF: - base_clock = ar7_ref_clock; + base_clock = AR7_REF_CLOCK; break; case BOOT_PLL_SOURCE_XTAL: - base_clock = ar7_xtal_clock; + base_clock = AR7_XTAL_CLOCK; break; case BOOT_PLL_SOURCE_CPU: base_clock = ar7_cpu_clock; @@ -236,10 +232,10 @@ static void tnetd7300_set_clock(u32 shift, struct tnetd7300_clock *clock, base_clock = ar7_bus_clock; break; case BOOT_PLL_SOURCE_REF: - base_clock = ar7_ref_clock; + base_clock = AR7_REF_CLOCK; break; case BOOT_PLL_SOURCE_XTAL: - base_clock = ar7_xtal_clock; + base_clock = AR7_XTAL_CLOCK; break; case BOOT_PLL_SOURCE_CPU: base_clock = ar7_cpu_clock; @@ -264,11 +260,11 @@ static void __init tnetd7300_init_clocks(void) struct tnetd7300_clocks *clocks = (struct tnetd7300_clocks *)ioremap_nocache(AR7_REGS_POWER + 0x20, sizeof(struct tnetd7300_clocks)); ar7_bus_clock = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT, - &clocks->bus, bootcr, ar7_afe_clock); + &clocks->bus, bootcr, AR7_AFE_CLOCK); if (*bootcr & BOOT_PLL_ASYNC_MODE) { ar7_cpu_clock = tnetd7300_get_clock(CPU_PLL_SOURCE_SHIFT, - &clocks->cpu, bootcr, ar7_afe_clock); + &clocks->cpu, bootcr, AR7_AFE_CLOCK); } else { ar7_cpu_clock = ar7_bus_clock; } @@ -334,23 +330,23 @@ static int tnetd7200_get_clock_base(int clock_id, u32 *bootcr) // Async switch (clock_id) { case TNETD7200_CLOCK_ID_DSP: - return ar7_ref_clock; + return AR7_REF_CLOCK; default: - return ar7_afe_clock; - } + return AR7_AFE_CLOCK; + } } else { // Sync if (*bootcr & BOOT_PLL_2TO1_MODE) { // 2:1 switch (clock_id) { case TNETD7200_CLOCK_ID_DSP: - return ar7_ref_clock; + return AR7_REF_CLOCK; default: - return ar7_afe_clock; + return AR7_AFE_CLOCK; } } else { // 1:1 - return ar7_ref_clock; + return AR7_REF_CLOCK; } } } diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h b/target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h index 49e66ff3a..ae1d4192b 100644 --- a/target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h +++ b/target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h @@ -66,6 +66,11 @@ #define AR7_IRQ_UART0 15 #define AR7_IRQ_UART1 16 +/* Clocks */ +#define AR7_AFE_CLOCK 35328000 +#define AR7_REF_CLOCK 25000000 +#define AR7_XTAL_CLOCK 24000000 + struct plat_cpmac_data { int reset_bit; int power_bit; |