Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67185
b: refs/heads/master
c: 2a4a9fb
h: refs/heads/master
i:
  67183: df26a4f
v: v3
  • Loading branch information
Jon Loeliger authored and Paul Mackerras committed Aug 17, 2007
1 parent 3c2b811 commit 3722be9
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c3ca32fdb820d59e63c95115ec5caf2862c85040
refs/heads/master: 2a4a9fbf26b109a748a336560ae3155c54f89de8
12 changes: 0 additions & 12 deletions trunk/arch/powerpc/platforms/embedded6xx/holly.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
7 changes: 0 additions & 7 deletions trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3722be9

Please sign in to comment.