projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot
[oweals/u-boot.git]
/
include
/
asm-ppc
/
immap_8260.h
diff --git
a/include/asm-ppc/immap_8260.h
b/include/asm-ppc/immap_8260.h
index 1272e99428d9ad805dbbc6c729546ed9d08183ef..4974ae56fcbb418acaa43bd37a0d377b9a8e2f79 100644
(file)
--- a/
include/asm-ppc/immap_8260.h
+++ b/
include/asm-ppc/immap_8260.h
@@
-147,7
+147,7
@@
typedef struct pci_config {
uint pci_oftpr;
char res8[4];
uint pci_ophpr;
uint pci_oftpr;
char res8[4];
uint pci_ophpr;
- char res8_2[4];
+ char res8_2[4];
uint pci_optpr;
char res9[8];
uint pci_mucr;
uint pci_optpr;
char res9[8];
uint pci_mucr;
@@
-385,6
+385,33
@@
typedef struct fcc {
u_char fcc_ftirr_phy[4];
} fcc_t;
u_char fcc_ftirr_phy[4];
} fcc_t;
+/* Fast controllers continued
+ */
+typedef struct fcc_c {
+ uint fcc_firper;
+ uint fcc_firer;
+ uint fcc_firsr_hi;
+ uint fcc_firsr_lo;
+ u_char fcc_gfemr;
+ char res1[15];
+} fcc_c_t;
+
+/* TC Layer
+ */
+typedef struct tclayer {
+ ushort tc_tcmode;
+ ushort tc_cdsmr;
+ ushort tc_tcer;
+ ushort tc_rcc;
+ ushort tc_tcmr;
+ ushort tc_fcc;
+ ushort tc_ccc;
+ ushort tc_icc;
+ ushort tc_tcc;
+ ushort tc_ecc;
+ char res1[12];
+} tclayer_t;
+
/* I2C
*/
typedef struct i2c {
/* I2C
*/
typedef struct i2c {
@@
-519,11
+546,17
@@
typedef struct immap {
fcc_t im_fcc[3]; /* Three FCCs */
fcc_t im_fcc[3]; /* Three FCCs */
- char res4[159];
+ char res4[32];
+ fcc_c_t im_fcc_c[3]; /* Continued FCCs */
+ char res4a[32];
+
+ tclayer_t im_tclayer[8]; /* Eight TCLayers */
+ ushort tc_tcgsr;
+ ushort tc_tcger;
/* First set of baud rate generators.
*/
/* First set of baud rate generators.
*/
- char res4
a[49
6];
+ char res4
b[23
6];
uint im_brgc5;
uint im_brgc6;
uint im_brgc7;
uint im_brgc5;
uint im_brgc6;
uint im_brgc7;