From 53e336e9ffc51035bdc4e5867631b3378761b4df Mon Sep 17 00:00:00 2001
From: Markus Klotzbuecher <mk@denx.de>
Date: Mon, 27 Nov 2006 11:43:09 +0100
Subject: Modified the mpc5xxx and the ppc4xx cpu to use the generic OHCI
 driver and adapted board configs TQM5200 and yosemite accordingly. This
 commit also makes the maximum number of root hub ports configurable
 (CFG_USB_OHCI_MAX_ROOT_PORTS).

---
 include/configs/TQM5200.h  | 7 +++++++
 include/configs/delta.h    | 1 +
 include/configs/mp2usb.h   | 1 +
 include/configs/trab.h     | 1 +
 include/configs/yosemite.h | 6 ++++++
 5 files changed, 16 insertions(+)

(limited to 'include')

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index be83b676720..832dcdde586 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -128,6 +128,13 @@
 #define CONFIG_USB_OHCI
 #define ADD_USB_CMD		CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
+
+#undef CFG_USB_OHCI_BOARD_INIT
+#define CFG_USB_OHCI_CPU_INIT
+#define CFG_USB_OHCI_REGS_BASE	MPC5XXX_USB
+#define CFG_USB_OHCI_SLOT_NAME	"mpc5200"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	15
+
 #else
 #define ADD_USB_CMD		0
 #endif
diff --git a/include/configs/delta.h b/include/configs/delta.h
index fea821ab9af..0617ad864e7 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -111,6 +111,7 @@
 #define CFG_USB_OHCI_CPU_INIT	1
 #define CFG_USB_OHCI_REGS_BASE	OHCI_REGS_BASE
 #define CFG_USB_OHCI_SLOT_NAME	"delta"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	3
 
 #define LITTLEENDIAN            1       /* used by usb_ohci.c  */
 
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index edb20f8d88e..d182d49488a 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -111,6 +111,7 @@
 #define CFG_USB_OHCI_CPU_INIT		1
 #define CFG_USB_OHCI_REGS_BASE		AT91_USB_HOST_BASE
 #define CFG_USB_OHCI_SLOT_NAME		"at91rm9200"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	15
 
 #undef CONFIG_HARD_I2C
 
diff --git a/include/configs/trab.h b/include/configs/trab.h
index ae979475b93..33617cdcd49 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -88,6 +88,7 @@
 #define CFG_USB_OHCI_CPU_INIT	1
 #define CFG_USB_OHCI_REGS_BASE	S3C24X0_USB_HOST_BASE
 #define CFG_USB_OHCI_SLOT_NAME	"s3c2400"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	15
 
 /*
  * Size of malloc() pool
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index a81cf34f11d..e6a02c6316c 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -216,6 +216,12 @@
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_STORAGE
 
+#undef CFG_USB_OHCI_BOARD_INIT
+#define CFG_USB_OHCI_CPU_INIT	1
+#define CFG_USB_OHCI_REGS_BASE	(CFG_PERIPHERAL_BASE | 0x1000)
+#define CFG_USB_OHCI_SLOT_NAME	"ppc440"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	15
+
 /*Comment this out to enable USB 1.1 device*/
 #define USB_2_0_DEVICE
 #endif /*CONFIG_440EP*/
-- 
cgit v1.3.1


From 7b59b3c7a8ce2e4b567abf99c1cd667bf35b9418 Mon Sep 17 00:00:00 2001
From: Markus Klotzbuecher <mk@denx.de>
Date: Mon, 27 Nov 2006 11:44:58 +0100
Subject: Introduced the configuration option CONFIG_USB_OHCI_NEW in order to
 be able to choose between the old and the generic OHCI drivers.

---
 board/trab/auto_update.c     | 2 +-
 cpu/arm920t/at91rm9200/usb.c | 2 +-
 cpu/arm920t/s3c24x0/usb.c    | 2 +-
 cpu/pxa/usb.c                | 2 +-
 drivers/usb_ohci.c           | 4 ++--
 include/configs/TQM5200.h    | 2 +-
 include/configs/delta.h      | 2 +-
 include/configs/mp2usb.h     | 2 +-
 include/configs/trab.h       | 2 +-
 include/configs/yosemite.h   | 2 +-
 include/usb.h                | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c
index d2c8d44a79f..7684499c246 100644
--- a/board/trab/auto_update.c
+++ b/board/trab/auto_update.c
@@ -34,7 +34,7 @@
 
 #ifdef CONFIG_AUTO_UPDATE
 
-#ifndef CONFIG_USB_OHCI
+#ifndef CONFIG_USB_OHCI_NEW
 #error "must define CONFIG_USB_OHCI"
 #endif
 
diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c
index 98e3cdd58a7..366262e4ccd 100644
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/cpu/arm920t/at91rm9200/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_AT91RM9200
 
 #include <asm/arch/hardware.h>
diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c
index 4bc7961a019..ef5d5bf71b1 100644
--- a/cpu/arm920t/s3c24x0/usb.c
+++ b/cpu/arm920t/s3c24x0/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
 
 #if defined(CONFIG_S3C2400)
diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index bff5bfb6ae9..5d273cb3518 100644
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_CPU_MONAHANS
 
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/usb_ohci.c b/drivers/usb_ohci.c
index be1a615ebeb..482633fc67e 100644
--- a/drivers/usb_ohci.c
+++ b/drivers/usb_ohci.c
@@ -43,7 +43,7 @@
 #include <common.h>
 /* #include <pci.h> no PCI on the S3C24X0 */
 
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_NEW
 
 /* mk: are these really required? */
 #if defined(CONFIG_S3C2400)
@@ -1756,4 +1756,4 @@ int usb_lowlevel_stop(void)
 	return 0;
 }
 
-#endif /* CONFIG_USB_OHCI */
+#endif /* CONFIG_USB_OHCI_NEW */
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 832dcdde586..6c8712b68d0 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -125,7 +125,7 @@
 
 /* USB */
 #ifdef CONFIG_STK52XX
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
 #define ADD_USB_CMD		CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
 
diff --git a/include/configs/delta.h b/include/configs/delta.h
index 0617ad864e7..4038f219602 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -103,7 +103,7 @@
 #endif
 
 /* USB */
-#define CONFIG_USB_OHCI         1
+#define CONFIG_USB_OHCI_NEW	1
 #define CONFIG_USB_STORAGE      1
 #define CONFIG_DOS_PARTITION    1
 
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index d182d49488a..2cf78a3b150 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -101,7 +101,7 @@
 
 #undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
 
-#define CONFIG_USB_OHCI		1
+#define CONFIG_USB_OHCI_NEW	1
 #define CONFIG_USB_KEYBOARD	1
 #define CONFIG_USB_STORAGE	1
 #define CONFIG_DOS_PARTITION	1
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 33617cdcd49..acf86d08ad2 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -80,7 +80,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
 /* USB stuff */
-#define CONFIG_USB_OHCI		1
+#define CONFIG_USB_OHCI_NEW	1
 #define CONFIG_USB_STORAGE	1
 #define CONFIG_DOS_PARTITION	1
 
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index e6a02c6316c..7f434e93f8d 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -213,7 +213,7 @@
 
 #ifdef CONFIG_440EP
 /* USB */
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
 #define CONFIG_USB_STORAGE
 
 #undef CFG_USB_OHCI_BOARD_INIT
diff --git a/include/usb.h b/include/usb.h
index bf715540417..fafac8934ad 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -169,7 +169,7 @@ struct usb_device {
  * this is how the lowlevel part communicate with the outer world
  */
 
-#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS)
+#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || defined (CONFIG_USB_SL811HS) || defined(CONFIG_USB_OHCI_NEW)
 int usb_lowlevel_init(void);
 int usb_lowlevel_stop(void);
 int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,int transfer_len);
-- 
cgit v1.3.1


From ae3b770e4eae8e98b6e9e29662e18c47fdf0171f Mon Sep 17 00:00:00 2001
From: Markus Klotzbuecher <mk@denx.de>
Date: Mon, 27 Nov 2006 11:46:46 +0100
Subject: Fix some endianness issues related to the generic ohci driver

---
 drivers/usb_ohci.c        | 60 ++++++++++++++++++++++++++++++++++++++---------
 include/configs/IceCube.h |  9 ++++++-
 include/usb.h             | 15 +++++++-----
 3 files changed, 66 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/drivers/usb_ohci.c b/drivers/usb_ohci.c
index 482633fc67e..c5e4c38efdf 100644
--- a/drivers/usb_ohci.c
+++ b/drivers/usb_ohci.c
@@ -62,15 +62,20 @@
 #include <usb.h>
 #include "usb_ohci.h"
 
-#undef S3C24X0_merge
+#define S3C24X0_merge
 
 #if defined(CONFIG_ARM920T) || \
     defined(CONFIG_S3C2400) || \
-    defined(CONFIG_S3C2410)
+    defined(CONFIG_S3C2410) || \
+    defined(CONFIG_440EP) || \
+    defined(CONFIG_MPC5200)
 # define OHCI_USE_NPS		/* force NoPowerSwitching mode */
 #endif
 
 #undef OHCI_VERBOSE_DEBUG	/* not always helpful */
+#undef DEBUG
+#undef SHOW_INFO
+#undef OHCI_FILL_TRACE
 
 /* For initializing controller (mask in an HCFS mode too) */
 #define OHCI_CONTROL_INIT \
@@ -95,8 +100,13 @@
 #define info(format, arg...) do {} while(0)
 #endif
 
-#define m16_swap(x) swap_16(x)
-#define m32_swap(x) swap_32(x)
+#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200)
+# define m16_swap(x) (x)
+# define m32_swap(x) (x)
+#else
+# define m16_swap(x) swap_16(x)
+# define m32_swap(x) swap_32(x)
+#endif
 
 /* global ohci_t */
 static ohci_t gohci;
@@ -523,7 +533,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi)
 		if (ohci->ed_controltail == NULL) {
 			writel (ed, &ohci->regs->ed_controlhead);
 		} else {
-			ohci->ed_controltail->hwNextED = m32_swap (ed);
+			ohci->ed_controltail->hwNextED = m32_swap ((unsigned long)ed);
 		}
 		ed->ed_prev = ohci->ed_controltail;
 		if (!ohci->ed_controltail && !ohci->ed_rm_list[0] &&
@@ -539,7 +549,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi)
 		if (ohci->ed_bulktail == NULL) {
 			writel (ed, &ohci->regs->ed_bulkhead);
 		} else {
-			ohci->ed_bulktail->hwNextED = m32_swap (ed);
+			ohci->ed_bulktail->hwNextED = m32_swap ((unsigned long)ed);
 		}
 		ed->ed_prev = ohci->ed_bulktail;
 		if (!ohci->ed_bulktail && !ohci->ed_rm_list[0] &&
@@ -635,7 +645,7 @@ static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe)
 		ed->hwINFO = m32_swap (OHCI_ED_SKIP); /* skip ed */
 		/* dummy td; end of td list for ed */
 		td = td_alloc (usb_dev);
-		ed->hwTailP = m32_swap (td);
+		ed->hwTailP = m32_swap ((unsigned long)td);
 		ed->hwHeadP = ed->hwTailP;
 		ed->state = ED_UNLINK;
 		ed->type = usb_pipetype (pipe);
@@ -693,12 +703,12 @@ static void td_fill (ohci_t *ohci, unsigned int info,
 		data = 0;
 
 	td->hwINFO = m32_swap (info);
-	td->hwCBP = m32_swap (data);
+	td->hwCBP = m32_swap ((unsigned long)data);
 	if (data)
-		td->hwBE = m32_swap (data + len - 1);
+		td->hwBE = m32_swap ((unsigned long)(data + len - 1));
 	else
 		td->hwBE = 0;
-	td->hwNextTD = m32_swap (td_pt);
+	td->hwNextTD = m32_swap ((unsigned long)td_pt);
 #ifndef S3C24X0_merge
 	td->hwPSW [0] = m16_swap (((__u32)data & 0x0FFF) | 0xE000);
 #endif
@@ -875,7 +885,12 @@ static int dl_done_list (ohci_t *ohci, td_t *td_list)
 		/* see if this done list makes for all TD's of current URB,
 		 * and mark the URB finished if so */
 		if (++(lurb_priv->td_cnt) == lurb_priv->length) {
+#if 1
+			if ((ed->state & (ED_OPER | ED_UNLINK)) &&
+			    (lurb_priv->state != URB_DEL))
+#else
 			if ((ed->state & (ED_OPER | ED_UNLINK)))
+#endif
 				urb_finished = 1;
 			else
 				dbg("dl_done_list: strange.., ED state %x, ed->state\n");
@@ -1068,9 +1083,15 @@ pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
 	}
 
 	bmRType_bReq  = cmd->requesttype | (cmd->request << 8);
+#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200)
+	wValue	      = __swap_16(cmd->value);
+	wIndex	      = __swap_16(cmd->index);
+	wLength	      = __swap_16(cmd->length);
+#else
 	wValue	      = m16_swap (cmd->value);
 	wIndex	      = m16_swap (cmd->index);
 	wLength	      = m16_swap (cmd->length);
+#endif /* CONFIG_440EP || CONFIG_MPC5200 */
 
 	info("Root-Hub: adr: %2x cmd(%1x): %08x %04x %04x %04x",
 		dev->devnum, 8, bmRType_bReq, wValue, wIndex, wLength);
@@ -1084,6 +1105,20 @@ pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
 	   RH_OTHER | RH_CLASS	almost ever means HUB_PORT here
 	*/
 
+#if defined(CONFIG_440EP) || defined(CONFIG_MPC5200)
+	case RH_GET_STATUS:
+			*(__u16 *) data_buf = __swap_16(1); OK (2);
+	case RH_GET_STATUS | RH_INTERFACE:
+			*(__u16 *) data_buf = __swap_16(0); OK (2);
+	case RH_GET_STATUS | RH_ENDPOINT:
+			*(__u16 *) data_buf = __swap_16(0); OK (2);
+	case RH_GET_STATUS | RH_CLASS:
+			*(__u32 *) data_buf = __swap_32(
+				RD_RH_STAT & ~(RH_HS_CRWE | RH_HS_DRWE));
+			OK (4);
+	case RH_GET_STATUS | RH_OTHER | RH_CLASS:
+			*(__u32 *) data_buf = __swap_32(RD_RH_PORTSTAT); OK (4);
+#else
 	case RH_GET_STATUS:
 			*(__u16 *) data_buf = m16_swap (1); OK (2);
 	case RH_GET_STATUS | RH_INTERFACE:
@@ -1096,6 +1131,7 @@ pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
 			OK (4);
 	case RH_GET_STATUS | RH_OTHER | RH_CLASS:
 			*(__u32 *) data_buf = m32_swap (RD_RH_PORTSTAT); OK (4);
+#endif /* CONFIG_440EP || CONFIG_MPC5200 */
 
 	case RH_CLEAR_FEATURE | RH_ENDPOINT:
 		switch (wValue) {
@@ -1294,8 +1330,10 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 		return -1;
 	}
 
+#if 0
 	wait_ms(10);
 	/* ohci_dump_status(&gohci); */
+#endif
 
 	/* allow more time for a BULK device to react - some are slow */
 #define BULK_TO	 5000	/* timeout in milliseconds */
@@ -1337,6 +1375,7 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 			err("CTL:TIMEOUT ");
 #ifdef S3C24X0_merge
 			dbg("submit_common_msg: TO status %x\n", stat);
+			stat = USB_ST_CRC_ERR;
 			urb_finished = 1;
 #endif
 			stat = USB_ST_CRC_ERR;
@@ -1755,5 +1794,4 @@ int usb_lowlevel_stop(void)
 
 	return 0;
 }
-
 #endif /* CONFIG_USB_OHCI_NEW */
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 1152f838d98..8753b9ff6f5 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -94,9 +94,16 @@
 
 /* USB */
 #if 1
-#define CONFIG_USB_OHCI
+#define CONFIG_USB_OHCI_NEW
 #define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
+
+#undef CFG_USB_OHCI_BOARD_INIT
+#define CFG_USB_OHCI_CPU_INIT
+#define CFG_USB_OHCI_REGS_BASE	MPC5XXX_USB
+#define CFG_USB_OHCI_SLOT_NAME	"mpc5200"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	15
+
 #else
 #define ADD_USB_CMD             0
 #endif
diff --git a/include/usb.h b/include/usb.h
index fafac8934ad..419a7e364a5 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -230,16 +230,12 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate);
 
 /* big endian -> little endian conversion */
 /* some CPUs are already little endian e.g. the ARM920T */
-#ifdef LITTLEENDIAN
-#define swap_16(x) ((unsigned short)(x))
-#define swap_32(x) ((unsigned long)(x))
-#else
-#define swap_16(x) \
+#define __swap_16(x) \
 	({ unsigned short x_ = (unsigned short)x; \
 	 (unsigned short)( \
 		((x_ & 0x00FFU) << 8) | ((x_ & 0xFF00U) >> 8) ); \
 	})
-#define swap_32(x) \
+#define __swap_32(x) \
 	({ unsigned long x_ = (unsigned long)x; \
 	 (unsigned long)( \
 		((x_ & 0x000000FFUL) << 24) | \
@@ -247,6 +243,13 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate);
 		((x_ & 0x00FF0000UL) >>	 8) | \
 		((x_ & 0xFF000000UL) >> 24) ); \
 	})
+
+#ifdef LITTLEENDIAN
+# define swap_16(x) (x)
+# define swap_32(x) (x)
+#else
+# define swap_16(x) __swap_16(x)
+# define swap_32(x) __swap_32(x)
 #endif /* LITTLEENDIAN */
 
 /*
-- 
cgit v1.3.1