diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-13 05:38:26 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-13 05:38:26 +0200 |
| commit | af3bf7fbe0148aadc8fedd6f5e5279cabef9ced5 (patch) | |
| tree | 25e3b1099ecf851bb7b5f6e6d3ffcdeb33de32f0 /arch/powerpc/include | |
| parent | powerpc/eeh: Check handle_eeh_events() return value (diff) | |
| parent | powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS (diff) | |
| download | linux-af3bf7fbe0148aadc8fedd6f5e5279cabef9ced5.tar.xz linux-af3bf7fbe0148aadc8fedd6f5e5279cabef9ced5.zip | |
Merge remote-tracking branch 'kumar/next' into next
Freescale updates for 3.6
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/immap_qe.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/qe.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h index 0edb6842b13d..61e8490786b8 100644 --- a/arch/powerpc/include/asm/immap_qe.h +++ b/arch/powerpc/include/asm/immap_qe.h @@ -26,7 +26,9 @@ struct qe_iram { __be32 iadd; /* I-RAM Address Register */ __be32 idata; /* I-RAM Data Register */ - u8 res0[0x78]; + u8 res0[0x04]; + __be32 iready; /* I-RAM Ready Register */ + u8 res1[0x70]; } __attribute__ ((packed)); /* QE Interrupt Controller */ diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h index 5e0b6d511e14..229571a49391 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/arch/powerpc/include/asm/qe.h @@ -499,6 +499,7 @@ enum comm_dir { /* I-RAM */ #define QE_IRAM_IADD_AIE 0x80000000 /* Auto Increment Enable */ #define QE_IRAM_IADD_BADDR 0x00080000 /* Base Address */ +#define QE_IRAM_READY 0x80000000 /* Ready */ /* UPC */ #define UPGCR_PROTOCOL 0x80000000 /* protocol ul2 or pl2 */ |