diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-06 22:41:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-06 22:41:53 +0100 |
| commit | 8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97 (patch) | |
| tree | b59fbfc85fa230b10b32bd4226d886e2d71bdcf6 /include | |
| parent | 367c6651a88dda0463f9fbeff3b1ab7ece05b4f9 (diff) | |
| parent | 26e5f794d3169080d89b57e64981a56e6a551da8 (diff) | |
| download | blackbird-obmc-uboot-8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97.tar.gz blackbird-obmc-uboot-8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/mpc83xx.h | 7 | ||||
| -rw-r--r-- | include/pci.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/mpc83xx.h b/include/mpc83xx.h index 07e0e0b47d..ea137c7c65 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -694,14 +694,21 @@ /* SPMR - System PLL Mode Register */ #define SPMR_LBIUCM 0x80000000 +#define SPMR_LBIUCM_SHIFT 31 #define SPMR_DDRCM 0x40000000 +#define SPMR_DDRCM_SHIFT 30 #define SPMR_SPMF 0x0F000000 +#define SPMR_SPMF_SHIFT 24 #define SPMR_CKID 0x00800000 #define SPMR_CKID_SHIFT 23 #define SPMR_COREPLL 0x007F0000 +#define SPMR_COREPLL_SHIFT 16 #define SPMR_CEVCOD 0x000000C0 +#define SPMR_CEVCOD_SHIFT 6 #define SPMR_CEPDF 0x00000020 +#define SPMR_CEPDF_SHIFT 5 #define SPMR_CEPMF 0x0000001F +#define SPMR_CEPMF_SHIFT 0 /* OCCR - Output Clock Control Register */ diff --git a/include/pci.h b/include/pci.h index e80b6bdf50..c6b264bdb5 100644 --- a/include/pci.h +++ b/include/pci.h @@ -420,6 +420,8 @@ struct pci_controller { /* Used by ppc405 autoconfig*/ struct pci_region *pci_fb; int current_busno; + + void *priv_data; }; extern __inline__ void pci_set_ops(struct pci_controller *hose, |
