linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] powerpc: Update QE/CPM2 usb_ctlr structures for USB support
@ 2008-11-08 17:51 Anton Vorontsov
  2008-11-08 18:21 ` Kumar Gala
  0 siblings, 1 reply; 2+ messages in thread
From: Anton Vorontsov @ 2008-11-08 17:51 UTC (permalink / raw)
  To: David Brownell; +Cc: Greg Kroah-Hartman, Li Yang, linux-usb, linuxppc-dev

From: Li Yang <leoli@freescale.com>

Fixes following build error:

  CC      drivers/usb/gadget/fsl_qe_udc.o
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_stall_change':
drivers/usb/gadget/fsl_qe_udc.c:156: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c:163: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eptx_stall_change':
drivers/usb/gadget/fsl_qe_udc.c:173: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c:180: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_nack':
drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_normal':
drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_reset':
drivers/usb/gadget/fsl_qe_udc.c:325: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c:342: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_register_init':
drivers/usb/gadget/fsl_qe_udc.c:515: error: 'struct usb_ctlr' has no member named 'usb_usep'
drivers/usb/gadget/fsl_qe_udc.c: In function 'ch9getstatus':
drivers/usb/gadget/fsl_qe_udc.c:1981: error: 'struct usb_ctlr' has no member named 'usb_usep'
make[2]: *** [drivers/usb/gadget/fsl_qe_udc.o] Error 1

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 arch/powerpc/include/asm/immap_cpm2.h |    9 +++------
 arch/powerpc/include/asm/immap_qe.h   |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/include/asm/immap_cpm2.h b/arch/powerpc/include/asm/immap_cpm2.h
index 4080bab..d4f069b 100644
--- a/arch/powerpc/include/asm/immap_cpm2.h
+++ b/arch/powerpc/include/asm/immap_cpm2.h
@@ -554,14 +554,11 @@ typedef struct usb_ctlr {
 	u8	usb_usadr;
 	u8	usb_uscom;
 	u8	res1[1];
-	u16	usb_usep1;
-	u16	usb_usep2;
-	u16	usb_usep3;
-	u16	usb_usep4;
+	__be16  usb_usep[4];
 	u8	res2[4];
-	u16	usb_usber;
+	__be16  usb_usber;
 	u8	res3[2];
-	u16	usb_usbmr;
+	__be16  usb_usbmr;
 	u8	usb_usbs;
 	u8	res4[7];
 } usb_cpm2_t;
diff --git a/arch/powerpc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
index 3c2fced..c346d0b 100644
--- a/arch/powerpc/include/asm/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
@@ -215,10 +215,7 @@ struct usb_ctlr {
 	u8	usb_usadr;
 	u8	usb_uscom;
 	u8	res1[1];
-	__be16	usb_usep1;
-	__be16	usb_usep2;
-	__be16	usb_usep3;
-	__be16	usb_usep4;
+	__be16  usb_usep[4];
 	u8	res2[4];
 	__be16	usb_usber;
 	u8	res3[2];
-- 
1.5.6.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/2] powerpc: Update QE/CPM2 usb_ctlr structures for USB support
  2008-11-08 17:51 [PATCH 1/2] powerpc: Update QE/CPM2 usb_ctlr structures for USB support Anton Vorontsov
@ 2008-11-08 18:21 ` Kumar Gala
  0 siblings, 0 replies; 2+ messages in thread
From: Kumar Gala @ 2008-11-08 18:21 UTC (permalink / raw)
  To: Anton Vorontsov
  Cc: Greg Kroah-Hartman, David Brownell, Li Yang, linux-usb,
	linuxppc-dev


On Nov 8, 2008, at 11:51 AM, Anton Vorontsov wrote:

> From: Li Yang <leoli@freescale.com>
>
> Fixes following build error:
>
>  CC      drivers/usb/gadget/fsl_qe_udc.o
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_stall_change':
> drivers/usb/gadget/fsl_qe_udc.c:156: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c:163: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eptx_stall_change':
> drivers/usb/gadget/fsl_qe_udc.c:173: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c:180: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_nack':
> drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c:201: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_eprx_normal':
> drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c:218: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_reset':
> drivers/usb/gadget/fsl_qe_udc.c:325: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c:342: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'qe_ep_register_init':
> drivers/usb/gadget/fsl_qe_udc.c:515: error: 'struct usb_ctlr' has no  
> member named 'usb_usep'
> drivers/usb/gadget/fsl_qe_udc.c: In function 'ch9getstatus':
> drivers/usb/gadget/fsl_qe_udc.c:1981: error: 'struct usb_ctlr' has  
> no member named 'usb_usep'
> make[2]: *** [drivers/usb/gadget/fsl_qe_udc.o] Error 1
>
> Signed-off-by: Li Yang <leoli@freescale.com>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
> arch/powerpc/include/asm/immap_cpm2.h |    9 +++------
> arch/powerpc/include/asm/immap_qe.h   |    5 +----
> 2 files changed, 4 insertions(+), 10 deletions(-)

applied to merge

- k

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-11-08 18:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-08 17:51 [PATCH 1/2] powerpc: Update QE/CPM2 usb_ctlr structures for USB support Anton Vorontsov
2008-11-08 18:21 ` Kumar Gala

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).