diff options
| author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
| commit | 790af6ed08cc3675267191eb60403bd4f0d9a03c (patch) | |
| tree | ded9dced10adeea568982bf634b9dc7d3c00f537 /cpu/mpc512x/pci.c | |
| parent | 69df282a781dfe7a1bfc62acf0605992d3ea6c52 (diff) | |
| parent | 57ae8a5cced612088104303777e71a3dc89c00ef (diff) | |
Merge branch 'r-ml-master' into t-master
Diffstat (limited to 'cpu/mpc512x/pci.c')
| -rw-r--r-- | cpu/mpc512x/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/mpc512x/pci.c b/cpu/mpc512x/pci.c index bbfab3e6935..141db8b8659 100644 --- a/cpu/mpc512x/pci.c +++ b/cpu/mpc512x/pci.c @@ -1,6 +1,6 @@ /* + * Copyright (C) 2009-2010 DENX Software Engineering <wd@denx.de> * Copyright (C) Freescale Semiconductor, Inc. 2006, 2007. - * Copyright (C) 2009 DENX Software Engineering <wd@denx.de> * * See file CREDITS for list of people who contributed to this * project. @@ -60,10 +60,10 @@ pci_init_board(void) struct pci_controller *hose; /* Set PCI divider for 33MHz */ - reg32 = im->clk.scfr[0]; + reg32 = in_be32(&im->clk.scfr[0]); reg32 &= ~(SCFR1_PCI_DIV_MASK); reg32 |= SCFR1_PCI_DIV << SCFR1_PCI_DIV_SHIFT; - im->clk.scfr[0] = reg32; + out_be32(&im->clk.scfr[0], reg32); clrsetbits_be32(&im->clk.scfr[0], SCFR1_PCI_DIV_MASK, |