From 3722be9b89d991304934e3f68461ad0b28283178 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Sat, 28 Jul 2007 04:25:09 +1000 Subject: [PATCH] --- yaml --- r: 67185 b: refs/heads/master c: 2a4a9fbf26b109a748a336560ae3155c54f89de8 h: refs/heads/master i: 67183: df26a4ff2ef16b087af7fba82a9dfe82aa7a3803 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/embedded6xx/holly.c | 12 ------------ trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c | 7 ------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 63e5e7073a87..399477f66afa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3ca32fdb820d59e63c95115ec5caf2862c85040 +refs/heads/master: 2a4a9fbf26b109a748a336560ae3155c54f89de8 diff --git a/trunk/arch/powerpc/platforms/embedded6xx/holly.c b/trunk/arch/powerpc/platforms/embedded6xx/holly.c index 6292e36dc577..76620913a9dc 100644 --- a/trunk/arch/powerpc/platforms/embedded6xx/holly.c +++ b/trunk/arch/powerpc/platforms/embedded6xx/holly.c @@ -113,23 +113,11 @@ static void holly_remap_bridge(void) static void __init holly_setup_arch(void) { - struct device_node *cpu; struct device_node *np; if (ppc_md.progress) ppc_md.progress("holly_setup_arch():set_bridge", 0); - cpu = of_find_node_by_type(NULL, "cpu"); - if (cpu) { - const unsigned int *fp; - - fp = of_get_property(cpu, "clock-frequency", NULL); - if (fp) - loops_per_jiffy = *fp / HZ; - else - loops_per_jiffy = 50000000 / HZ; - of_node_put(cpu); - } tsi108_csr_vir_base = get_vir_csrbase(); /* setup PCI host bridge */ diff --git a/trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c index 53420951dc53..54675648d6de 100644 --- a/trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c +++ b/trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c @@ -44,7 +44,6 @@ static void __init prpmc2800_setup_arch(void) struct device_node *np; phys_addr_t paddr; const unsigned int *reg; - const unsigned int *prop; /* * ioremap mpp and gpp registers in case they are later @@ -62,12 +61,6 @@ static void __init prpmc2800_setup_arch(void) of_node_put(np); mv64x60_gpp_reg_base = ioremap(paddr, reg[1]); - np = of_find_node_by_type(NULL, "cpu"); - prop = of_get_property(np, "clock-frequency", NULL); - if (prop) - loops_per_jiffy = *prop / HZ; - of_node_put(np); - #ifdef CONFIG_PCI mv64x60_pci_init(); #endif