KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use constant for clock values (closes: #2306)

Browse source 
SVN-Revision: 8607
This commit is contained in:
Nicolas Thill 2007-09-04 10:27:32 +00:00
parent 550f71e70d
commit 5956d4bfc2
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
target/linux/ar7-2.6/files/arch/mips/ar7/clock.c
View file

@ -92,10 +92,6 @@ struct tnetd7200_clocks {
struct tnetd7200_clock usb; struct tnetd7200_clock usb;
} __attribute__ ((packed)); } __attribute__ ((packed));
int ar7_afe_clock = 35328000;
int ar7_ref_clock = 25000000;
int ar7_xtal_clock = 24000000;
int ar7_cpu_clock = 150000000; int ar7_cpu_clock = 150000000;
EXPORT_SYMBOL(ar7_cpu_clock); EXPORT_SYMBOL(ar7_cpu_clock);
int ar7_bus_clock = 125000000; 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) u32 *bootcr, u32 bus_clock)
{ {
int product; int product;
int base_clock = ar7_ref_clock; int base_clock = AR7_REF_CLOCK;
u32 ctrl = clock->ctrl; u32 ctrl = clock->ctrl;
u32 pll = clock->pll; u32 pll = clock->pll;
int prediv = ((ctrl & PREDIV_MASK) >> PREDIV_SHIFT) + 1; 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; base_clock = bus_clock;
break; break;
case BOOT_PLL_SOURCE_REF: case BOOT_PLL_SOURCE_REF:
base_clock = ar7_ref_clock; base_clock = AR7_REF_CLOCK;
break; break;
case BOOT_PLL_SOURCE_XTAL: case BOOT_PLL_SOURCE_XTAL:
base_clock = ar7_xtal_clock; base_clock = AR7_XTAL_CLOCK;
break; break;
case BOOT_PLL_SOURCE_CPU: case BOOT_PLL_SOURCE_CPU:
base_clock = ar7_cpu_clock; 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; base_clock = ar7_bus_clock;
break; break;
case BOOT_PLL_SOURCE_REF: case BOOT_PLL_SOURCE_REF:
base_clock = ar7_ref_clock; base_clock = AR7_REF_CLOCK;
break; break;
case BOOT_PLL_SOURCE_XTAL: case BOOT_PLL_SOURCE_XTAL:
base_clock = ar7_xtal_clock; base_clock = AR7_XTAL_CLOCK;
break; break;
case BOOT_PLL_SOURCE_CPU: case BOOT_PLL_SOURCE_CPU:
base_clock = ar7_cpu_clock; 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)); 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, 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) { if (*bootcr & BOOT_PLL_ASYNC_MODE) {
ar7_cpu_clock = tnetd7300_get_clock(CPU_PLL_SOURCE_SHIFT, ar7_cpu_clock = tnetd7300_get_clock(CPU_PLL_SOURCE_SHIFT,
&clocks->cpu, bootcr, ar7_afe_clock); &clocks->cpu, bootcr, AR7_AFE_CLOCK);
} else { } else {
ar7_cpu_clock = ar7_bus_clock; ar7_cpu_clock = ar7_bus_clock;
} }
@ -334,23 +330,23 @@ static int tnetd7200_get_clock_base(int clock_id, u32 *bootcr)
// Async // Async
switch (clock_id) { switch (clock_id) {
case TNETD7200_CLOCK_ID_DSP: case TNETD7200_CLOCK_ID_DSP:
return ar7_ref_clock; return AR7_REF_CLOCK;
default: default:
return ar7_afe_clock; return AR7_AFE_CLOCK;
} }
} else { } else {
// Sync // Sync
if (*bootcr & BOOT_PLL_2TO1_MODE) { if (*bootcr & BOOT_PLL_2TO1_MODE) {
// 2:1 // 2:1
switch (clock_id) { switch (clock_id) {
case TNETD7200_CLOCK_ID_DSP: case TNETD7200_CLOCK_ID_DSP:
return ar7_ref_clock; return AR7_REF_CLOCK;
default: default:
return ar7_afe_clock; return AR7_AFE_CLOCK;
} }
} else { } else {
// 1:1 // 1:1
return ar7_ref_clock; return AR7_REF_CLOCK;
} }
} }
} }

5
target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h
View file

@ -66,6 +66,11 @@
#define AR7_IRQ_UART0 15 #define AR7_IRQ_UART0 15
#define AR7_IRQ_UART1 16 #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 { struct plat_cpmac_data {
int reset_bit; int reset_bit;
int power_bit; int power_bit;