diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-10-12 12:49:16 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-11-11 22:43:18 -0500 |
commit | 80952988a2c6f0aa73e9ec6554084446da8d8791 (patch) | |
tree | e6a3e1121b796c99894b9510321b5e36d507ca8f /arch/powerpc/include/asm/cpm.h | |
parent | 644b2a680ccc51a9ec4d6beb12e9d47d2dee98e2 (diff) |
powerpc/qe&cpm2: Avoid redefinitions in CPM2 and QE headers
struct mcc defined in both immap_qe.h and immap_cpm2.h, so they will
conflic when included in a single file. The mcc struct is easy to deal
with, since it isn't used in any driver (yet), so let's just rename QE
version to qe_mcc.
The ucb_ctlr is a bit trickier, since it is used by fsl_qe_udc driver,
and the driver supports both CPM and QE UDCs, plus the QE version is
used to form a bigger immap struct.
I don't want to touch too much of USB code in this series, so for now
let's just copy most generic version into the common cpm.h header,
later we'll create cpm_usb.h where we'll place common USB structs that
are used by QE/CPM UDC and QE Host drivers (FHCI).
And as for the structs in qe.h and cpm2.h, just prefix them with qe_
and cpm_.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/cpm.h')
-rw-r--r-- | arch/powerpc/include/asm/cpm.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h index 24d79e3abd8e..b5f15340dc22 100644 --- a/arch/powerpc/include/asm/cpm.h +++ b/arch/powerpc/include/asm/cpm.h | |||
@@ -5,6 +5,28 @@ | |||
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/of.h> | 6 | #include <linux/of.h> |
7 | 7 | ||
8 | /* | ||
9 | * USB Controller pram common to QE and CPM. | ||
10 | */ | ||
11 | struct usb_ctlr { | ||
12 | u8 usb_usmod; | ||
13 | u8 usb_usadr; | ||
14 | u8 usb_uscom; | ||
15 | u8 res1[1]; | ||
16 | __be16 usb_usep[4]; | ||
17 | u8 res2[4]; | ||
18 | __be16 usb_usber; | ||
19 | u8 res3[2]; | ||
20 | __be16 usb_usbmr; | ||
21 | u8 res4[1]; | ||
22 | u8 usb_usbs; | ||
23 | /* Fields down below are QE-only */ | ||
24 | __be16 usb_ussft; | ||
25 | u8 res5[2]; | ||
26 | __be16 usb_usfrn; | ||
27 | u8 res6[0x22]; | ||
28 | } __attribute__ ((packed)); | ||
29 | |||
8 | /* Opcodes common to CPM1 and CPM2 | 30 | /* Opcodes common to CPM1 and CPM2 |
9 | */ | 31 | */ |
10 | #define CPM_CR_INIT_TRX ((ushort)0x0000) | 32 | #define CPM_CR_INIT_TRX ((ushort)0x0000) |