pxa25x_udc: Remove usbdescriptors.h

PATCH New Lukasz Dalek 2 participants 5 messages Nov 29, 2012 USB

lore

Share & tools

lore

Lukasz Dalek

author

2012-11-29 12:59 UTC #0 lore raw

PATCH 1/1 pxa25x_udc: Remove usbdescriptors.h

usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.

Signed-off-by Lukasz Dalek <[email protected]>

---
 drivers/usb/gadget/pxa25x_udc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

drivers/usb/gadget/pxa25x_udc.c +0 -1

index dd74143..9ce98f0 100644
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 
-#include <usbdescriptors.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <usb/lin_gadget_compat.h>

Signature · 1 line

1.7.8.6

Marek Vasut

Applied

2012-11-29 14:27 UTC #1 lore raw

PATCH 1/1 pxa25x_udc: Remove usbdescriptors.h

Dear Lukasz Dalek,

Quoted 2 lines

usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.

Applied, thanks

Quoted 10 lines

Signed-off-by Lukasz Dalek <[email protected]>
---
 drivers/usb/gadget/pxa25x_udc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
(quoted diff) +0 -0
b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 100644

drivers/usb/gadget/pxa25x_udc.c line 45

Quoted 7 lines

drivers/usb/gadget/pxa25x_udc.c +0 -1

@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 
-#include <usbdescriptors.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <usb/lin_gadget_compat.h>

Best regards,
Marek Vasut

Łukasz Dałek

author

2012-11-29 14:45 UTC #2 lore raw

PATCH 1/1 pxa25x_udc: Remove usbdescriptors.h

Quoted 19 lines · Marek Vasut

Dear Lukasz Dalek,
Quoted 2 lines
usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.
Applied, thanks
Quoted 13 lines
Signed-off-by Lukasz Dalek<[email protected]>
---
  drivers/usb/gadget/pxa25x_udc.c |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
(quoted diff) +0 -0
b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 100644
drivers/usb/gadget/pxa25x_udc.c +0 -0
@@ -40,7 +40,6 @@
  #include<asm/io.h>
  #include<asm/arch/pxa.h>
 

Quoted 6 lines

drivers/usb/gadget/pxa25x_udc.c line 45
Quoted 4 lines
drivers/usb/gadget/pxa25x_udc.c +0 -1
-#include<usbdescriptors.h>
  #include<linux/usb/ch9.h>
  #include<linux/usb/gadget.h>
  #include<usb/lin_gadget_compat.h>
Best regards,
Marek Vasut

One more question. I've send you before patch which enables support for USB in h2200 device, which you accepted but didn't push. Did you find more problem out there or just forgot to apply?

?ukasz Da?ek

Marek Vasut

2012-11-29 14:51 UTC #3 lore raw

PATCH 1/1 pxa25x_udc: Remove usbdescriptors.h

Dear ?ukasz Da?ek,

Quoted 32 lines · Marek Vasut

Quoted 22 lines
Dear Lukasz Dalek,
Quoted 2 lines
usbdescriptors.h conflicts with linux/usb/ch9.h.
Remove it.
Applied, thanks
Quoted 15 lines
Signed-off-by Lukasz Dalek<[email protected]>
---
  drivers/usb/gadget/pxa25x_udc.c |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
(quoted diff) +0 -0
b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 100644
drivers/usb/gadget/pxa25x_udc.c +0 -0
@@ -40,7 +40,6 @@
 
  #include<asm/io.h>
  #include<asm/arch/pxa.h>
 
Quoted 8 lines
Quoted 5 lines
drivers/usb/gadget/pxa25x_udc.c +0 -1
-#include<usbdescriptors.h>
 
  #include<linux/usb/ch9.h>
  #include<linux/usb/gadget.h>
  #include<usb/lin_gadget_compat.h>
Best regards,
Marek Vasut

Quoted 4 lines

One more question. I've send you before patch which enables support for USB in h2200 device, which you accepted but didn't push. Did you find more problem out there or just forgot to apply?

It might have gone lost ... can you repost?

Best regards,
Marek Vasut

Lukasz Dalek

author

2012-11-29 14:55 UTC #4 lore raw

PATCH v7 1/1 h2200: Add USB CDC ethernet support

Add support for ethernet over USB which can be used for e.g. booting process. It works with tftp and dhcp clients code.

Signed-off-by Lukasz Dalek <[email protected]>

---
Changes for v7:
- Removed CONFIG_H2200_USBETH
Changes for v6:
- Defined only one entire for board
Changes for v5:
- Surrendered #include <usb.h> with CONFIGs

---
 board/h2200/h2200.c     |   11 +++++++++++
 include/configs/h2200.h |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)

board/h2200/h2200.c +11 -0

index 3076306..720b06e 100644
@@ -22,9 +22,16 @@
 #include <asm/arch/pxa.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
+#include <usb.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int board_eth_init(bd_t *bis)
+{
+	usb_eth_initialize(bis);
+	return 0;
+}
+
 int board_init(void)
 {
 	/* We have RAM, disable cache */

@@ -36,6 +43,10 @@ int board_init(void)
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
 
+	/* Let host see that device is disconnected */
+	udc_disconnect();
+	mdelay(500);
+
 	return 0;
 }

include/configs/h2200.h +25 -0

index ef14dd3..516a26e 100644
@@ -154,4 +154,29 @@
 
 #define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"
 
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_USB_DEV_PULLUP_GPIO	33
+/* USB VBUS GPIO 3 */
+
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+
+#define CONFIG_BOOTDELAY		2
+#define CONFIG_BOOTCOMMAND		\
+	"setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \
+	"if bootp ; then setenv downloaded 1 ; fi ; done ; " \
+	"source :script ; " \
+	"bootm ; "
+
+#define CONFIG_USB_GADGET_PXA2XX
+#define CONFIG_USB_ETHER
+#define CONFIG_USB_ETH_SUBSET
+
+#define CONFIG_USBNET_DEV_ADDR		"de:ad:be:ef:00:01"
+#define CONFIG_USBNET_HOST_ADDR	"de:ad:be:ef:00:02"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"stdin=serial\0" \
+	"stdout=serial\0" \
+	"stderr=serial\0"
+
 #endif /* __CONFIG_H */

Signature · 1 line

1.7.8.6