diff options
author | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
commit | 786d3693f46579c7cd982e65de9f43eba94e4a57 (patch) | |
tree | e794415702e30899fd7181072e8753bb8068cce2 /arch/powerpc/boot/treeboot-walnut.c | |
parent | dba5baf32887f58414ed7183a95309686894eab2 (diff) | |
parent | 739253765ed55742431866b19330fa0e1012c417 (diff) |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/boot/treeboot-walnut.c')
-rw-r--r-- | arch/powerpc/boot/treeboot-walnut.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c index 3adf2d08a23..bb2c309d70f 100644 --- a/arch/powerpc/boot/treeboot-walnut.c +++ b/arch/powerpc/boot/treeboot-walnut.c @@ -57,8 +57,8 @@ void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk) } /* setup the timebase clock to tick at the cpu frequency */ - cpc0_cr1 = cpc0_cr1 & ~ 0x00800000; - mtdcr(DCRN_CPC0_CR1, cpc0_cr1); + cpc0_cr1 = cpc0_cr1 & ~0x00800000; + mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1); tb = cpu; dt_fixup_cpu_clocks(cpu, tb, 0); @@ -109,6 +109,7 @@ static void walnut_flashsel_fixup(void) setprop(sram, "reg", reg_sram, sizeof(reg_sram)); } +#define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b static void walnut_fixups(void) { ibm4xx_fixup_memsize(); @@ -116,6 +117,7 @@ static void walnut_fixups(void) ibm4xx_quiesce_eth((u32 *)0xef600800, NULL); ibm4xx_fixup_ebc_ranges("/plb/ebc"); walnut_flashsel_fixup(); + dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF); } void platform_init(void) |