Move ehci headers, add Efika USB support

From: Fabio Estevam <[email protected]>

Move ehci.h and ehci-core.h to include/usb directory.

Signed-off-by Fabio Estevam <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Marek Vasut <[email protected]>

the cover letter is missing

and it's sent as a set of separate patches. Why?

Add macros and structures needed by Efika USB support code. Move shared offset and bits definitions into common header file.

Signed-off-by Jana Rapava <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
 drivers/usb/host/ehci-mxc.c |   31 +--------
 include/usb/ehci-fsl.h      |  146 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 148 insertions(+), 29 deletions(-)

include/usb/ehci-fsl.h +0 -0

index 67600ed..727134f 100644

include/usb/ehci-fsl.h +26 -0

+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
+/* offset for first USB CTRL register */
+#define MX5_CTRL_REGS_OFFSET	0x800
+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX31)
+/* USB_CTRL register bits of interest*/
+#define MXC_OTG_SIC_SHIFT	29
+#define MXC_OTG_SIC_MASK	(0x3 << MX31_OTG_SIC_SHIFT)
+#define MXC_OTG_WUE		(1 << 27)
+#define MXC_OTG_PM		(1 << 24)
+#endif
+
+#ifdef CONFIG_MX51
+#define MX51_REGISTER_LAYOUT_LENGTH	0x200
+
+/* Register offsets for MX51 */
+#define MX51_OTG_ID	0x000
+#define MX51_UH1_ID	0x200
+#define MX51_UH2_ID	0x400
+
+/* USB_CTRL register bits of interest*/
+#define MX51_OTG_PM		(1 << 24)
+#define MX51_H1_ULPI_IE	(1 << 12)

include/usb/ehci-fsl.h +10 -0

+
+/* USB_CTRL_1 register bits of interest */
+#define MX51_H1_EXTCLKE	(1 << 25)
+
+/* USB Host 2 CTRL register bits of interest */
+#define MX51_H2_ULPI_IE	(1 << 8)
+#define MX51_H2_WUE		(1 << 7)
+#define MX51_H2_PM		(1 << 4)
+
+/* PORTSCx bits of interest */

include/usb/ehci-fsl.h +7 -0

+#define ULPI_ID_REGS_COUNT	4
+#define ULPI_TEST_VALUE	0x55
+#define ULPI_TIMEOUT		1000 /* some reasonable value */
+
+/* ULPI viewport control bits */
+#define ULPI_WU	(1 << 31)
+#define ULPI_SS	(1 << 27)

include/usb/ehci-fsl.h +24 -0

+
+struct mxc_ulpi_regs {
+	u8	vendor_id_low;		/* 0x00 - Vendor ID lower byte */
+	u8	vendor_id_high;		/* 0x01 - Vendor ID upper byte */
+	u8	product_id_low;		/* 0x02 - Product ID lower byte */
+	u8	product_id_high;	/* 0x03 - Product ID higher byte */
+	/* Function Control; 0x04 - 0x06 Read, 0x04 Write */
+	u8	function_ctrl_write;
+	u8	function_ctrl_set;	/* 0x05 Set */
+	u8	function_ctrl_clear;	/* 0x06 Clear */
+	/* Interface Control; 0x07 - 0x09 Read, 0x07 Write */
+	u8	iface_ctrl_write;
+	u8	iface_ctrl_set;		/* 0x08 Set */
+	u8	iface_ctrl_clear;	/* 0x09 Clear */
+	/* OTG Control; 0x0A - 0x0C Read, 0x0A Write */
+	u8	otg_ctrl_write;
+	u8	otg_ctrl_set;		/* 0x0B Set */
+	u8	otg_ctrl_clear;		/* 0x0C Clear */
+	/* USB Interrupt Enable Rising; 0x0D - 0x0F Read, 0x0D Write */
+	u8	usb_ie_rising_write;
+	u8	usb_ie_rising_set;	/* 0x0E Set */
+	u8	usb_ie_rising_clear;	/* 0x0F Clear */
+	/* USB Interrupt Enable Falling; 0x10 - 0x12 Read, 0x10 Write */
+	u8	usb_ie_falling_write;

+
#endif /* _EHCI_FSL_H */

Quoted 30 lines

include/usb/ehci-fsl.h +30 -0

+struct mxc_ulpi_regs {
+     u8      vendor_id_low;          /* 0x00 - Vendor ID lower byte */
+     u8      vendor_id_high;         /* 0x01 - Vendor ID upper byte */
+     u8      product_id_low;         /* 0x02 - Product ID lower byte */
+     u8      product_id_high;        /* 0x03 - Product ID higher byte */
+     /* Function Control; 0x04 - 0x06 Read, 0x04 Write */
+     u8      function_ctrl_write;
+     u8      function_ctrl_set;      /* 0x05 Set */
+     u8      function_ctrl_clear;    /* 0x06 Clear */
+     /* Interface Control; 0x07 - 0x09 Read, 0x07 Write */
+     u8      iface_ctrl_write;
+     u8      iface_ctrl_set;         /* 0x08 Set */
+     u8      iface_ctrl_clear;       /* 0x09 Clear */
+     /* OTG Control; 0x0A - 0x0C Read, 0x0A Write */
+     u8      otg_ctrl_write;
+     u8      otg_ctrl_set;           /* 0x0B Set */
+     u8      otg_ctrl_clear;         /* 0x0C Clear */
+     /* USB Interrupt Enable Rising; 0x0D - 0x0F Read, 0x0D Write */
+     u8      usb_ie_rising_write;
+     u8      usb_ie_rising_set;      /* 0x0E Set */
+     u8      usb_ie_rising_clear;    /* 0x0F Clear */
+     /* USB Interrupt Enable Falling; 0x10 - 0x12 Read, 0x10 Write */
+     u8      usb_ie_falling_write;
+     u8      usb_ie_falling_set;     /* 0x11 Set */
+     u8      usb_ie_falling_clear;   /* 0x12 Clear */
+     u8      usb_int_status;         /* 0x13 - USB Interrupt Status */
+     u8      usb_int_latch;          /* 0x14 - USB Interrupt Latch */
+     u8      debug;                  /* 0x15 - Debug */
+     /* Scratch Register; 0x16 - 0x18 Read, 0x16 Write */
+     u8      scratch_write;

include/usb/ehci-fsl.h struct usb_ehci { · line 387

Quoted 3 lines

include/usb/ehci-fsl.h +3 -0

+     u8      scratch_set;            /* 0x17 Set */
+     u8      scratch_clear;          /* 0x18 Clear*/
+};

These are the generic ULPI specification registers and not mxc specific.
I'd expect to have them in a more generic location.

--

Igor.

2011/10/31 Igor Grinberg <grinberg at compulab.co.il <mailto:[email protected]>>

Quoted 23 lines

include/usb/ehci-fsl.h +23 -0

+struct mxc_ulpi_regs {
+     u8      vendor_id_low;          /* 0x00 - Vendor ID lower byte */
+     u8      vendor_id_high;         /* 0x01 - Vendor ID upper byte */
+     u8      product_id_low;         /* 0x02 - Product ID lower byte */
+     u8      product_id_high;        /* 0x03 - Product ID higher byte */
+     /* Function Control; 0x04 - 0x06 Read, 0x04 Write */
+     u8      function_ctrl_write;
+     u8      function_ctrl_set;      /* 0x05 Set */
+     u8      function_ctrl_clear;    /* 0x06 Clear */
+     /* Interface Control; 0x07 - 0x09 Read, 0x07 Write */
+     u8      iface_ctrl_write;
+     u8      iface_ctrl_set;         /* 0x08 Set */
+     u8      iface_ctrl_clear;       /* 0x09 Clear */
+     /* OTG Control; 0x0A - 0x0C Read, 0x0A Write */
+     u8      otg_ctrl_write;
+     u8      otg_ctrl_set;           /* 0x0B Set */
+     u8      otg_ctrl_clear;         /* 0x0C Clear */
+     /* USB Interrupt Enable Rising; 0x0D - 0x0F Read, 0x0D Write */
+     u8      usb_ie_rising_write;
+     u8      usb_ie_rising_set;      /* 0x0E Set */
+     u8      usb_ie_rising_clear;    /* 0x0F Clear */
+     /* USB Interrupt Enable Falling; 0x10 - 0x12 Read, 0x10 Write */
+     u8      usb_ie_falling_write;

include/usb/ehci-fsl.h struct usb_ehci { · line 387

Quoted 10 lines

include/usb/ehci-fsl.h +10 -0

+     u8      usb_ie_falling_set;     /* 0x11 Set */
+     u8      usb_ie_falling_clear;   /* 0x12 Clear */
+     u8      usb_int_status;         /* 0x13 - USB Interrupt Status */
+     u8      usb_int_latch;          /* 0x14 - USB Interrupt Latch */
+     u8      debug;                  /* 0x15 - Debug */
+     /* Scratch Register; 0x16 - 0x18 Read, 0x16 Write */
+     u8      scratch_write;
+     u8      scratch_set;            /* 0x17 Set */
+     u8      scratch_clear;          /* 0x18 Clear*/
+};

These are the generic ULPI specification registers and not mxc specific.
I'd expect to have them in a more generic location.

This would be fixed in general ULPI support patch I'm working on. It should be ready for posting in a few days.

Add macros and structures needed by Efika USB support code. Move shared offset and bits definitions into common header file.

Signed-off-by Jana Rapava <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

---
Changes for v2:
- whitespace and coding style changes (no actual changes)

Add macros and structures needed by Efika USB support code. Move shared offset and bits definitions into common header file.

Signed-off-by Jana Rapava <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

---
Changes for v2:
- whitespace and coding style changes (no actual changes)

 drivers/usb/host/ehci-mxc.c |   31 +--------
 include/usb/ehci-fsl.h      |  146 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 148 insertions(+), 29 deletions(-)

include/usb/ehci-fsl.h +0 -0

index 67600ed..f957c65 100644

include/usb/ehci-fsl.h +12 -0

+#define ULPI_ID_REGS_COUNT	4
+#define ULPI_TEST_VALUE		0x55
+#define ULPI_TIMEOUT		1000 /* some reasonable value */
+
+/* ULPI viewport control bits */
+#define ULPI_WU		(1 << 31)
+#define ULPI_SS		(1 << 27)
+#define ULPI_RWRUN	(1 << 30)
+#define ULPI_RWCTRL	(1 << 29)
+
+/* ULPI OTG Control bits of interest */
+#define ULPI_OTG_EXT_VBUS_IND	(1 << 7)

include/usb/ehci-fsl.h +24 -0

+
+struct mxc_ulpi_regs {
+	u8	vendor_id_low;		/* 0x00 - Vendor ID lower byte */
+	u8	vendor_id_high;		/* 0x01 - Vendor ID upper byte */
+	u8	product_id_low;		/* 0x02 - Product ID lower byte */
+	u8	product_id_high;	/* 0x03 - Product ID higher byte */
+	/* Function Control; 0x04 - 0x06 Read, 0x04 Write */
+	u8	function_ctrl_write;
+	u8	function_ctrl_set;	/* 0x05 Set */
+	u8	function_ctrl_clear;	/* 0x06 Clear */
+	/* Interface Control; 0x07 - 0x09 Read, 0x07 Write */
+	u8	iface_ctrl_write;
+	u8	iface_ctrl_set;		/* 0x08 Set */
+	u8	iface_ctrl_clear;	/* 0x09 Clear */
+	/* OTG Control; 0x0A - 0x0C Read, 0x0A Write */
+	u8	otg_ctrl_write;
+	u8	otg_ctrl_set;		/* 0x0B Set */
+	u8	otg_ctrl_clear;		/* 0x0C Clear */
+	/* USB Interrupt Enable Rising; 0x0D - 0x0F Read, 0x0D Write */
+	u8	usb_ie_rising_write;
+	u8	usb_ie_rising_set;	/* 0x0E Set */
+	u8	usb_ie_rising_clear;	/* 0x0F Clear */
+	/* USB Interrupt Enable Falling; 0x10 - 0x12 Read, 0x10 Write */
+	u8	usb_ie_falling_write;

Do you already have a header for the generic ULPI support? Can't the above be put in that header and the next patch set (ULPI) will just extend this?

--
Regards,
Igor.

Add macros and structures needed by Efika USB support code. Move shared offset and bits definitions into common header file.

Signed-off-by Jana Rapava <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Wolfgang Grandegger <[email protected]>

---
Changes for v2:
- whitespace and coding style changes
Changes for v3:
- ULPI-related definitions moved to ULPI header file
Changes for v4:
- rename "ulpi_viewpoint", because it's called "ulpi_viewport" in documentation

 drivers/usb/host/ehci-mxc.c |   31 +--------------
 include/usb/ehci-fsl.h      |   86 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 29 deletions(-)

drivers/usb/host/ehci-mxc.c +3 -28

index fde1f0f..2c1295f 100644
@@ -27,31 +27,6 @@
 #include <usb/ehci.h>
 #include <usb/ehci-core.h>
 
-#define USBCTRL_OTGBASE_OFFSET	0x600
-
-#ifdef CONFIG_MX25
-#define MX25_USB_CTRL_IP_PUE_DOWN_BIT	(1<<6)
-#define MX25_USB_CTRL_HSTD_BIT		(1<<5)
-#define MX25_USB_CTRL_USBTE_BIT		(1<<4)
-#define MX25_USB_CTRL_OCPOL_OTG_BIT	(1<<3)
-#endif
-
-#ifdef CONFIG_MX31
-#define MX31_OTG_SIC_SHIFT	29
-#define MX31_OTG_SIC_MASK	(0x3 << MX31_OTG_SIC_SHIFT)
-#define MX31_OTG_PM_BIT		(1 << 24)
-
-#define MX31_H2_SIC_SHIFT	21
-#define MX31_H2_SIC_MASK	(0x3 << MX31_H2_SIC_SHIFT)
-#define MX31_H2_PM_BIT		(1 << 16)
-#define MX31_H2_DT_BIT		(1 << 5)
-
-#define MX31_H1_SIC_SHIFT	13
-#define MX31_H1_SIC_MASK	(0x3 << MX31_H1_SIC_SHIFT)
-#define MX31_H1_PM_BIT		(1 << 8)
-#define MX31_H1_DT_BIT		(1 << 4)
-#endif
-
 static int mxc_set_usbcontrol(int port, unsigned int flags)
 {
 	unsigned int v;

@@ -66,11 +41,11 @@ static int mxc_set_usbcontrol(int port, unsigned int flags)
 
 		switch (port) {
 		case 0:	/* OTG port */
-			v &= ~(MX31_OTG_SIC_MASK | MX31_OTG_PM_BIT);
+			v &= ~(MXC_OTG_SIC_MASK | MXC_OTG_PM_BIT);
 			v |= (flags & MXC_EHCI_INTERFACE_MASK)
-					<< MX31_OTG_SIC_SHIFT;
+					<< MXC_OTG_SIC_SHIFT;
 			if (!(flags & MXC_EHCI_POWER_PINS_ENABLED))
-				v |= MX31_OTG_PM_BIT;
+				v |= MXC_OTG_PM_BIT;
 
 			break;
 		case 1: /* H1 port */

include/usb/ehci-fsl.h +55 -0

index 67600ed..2b1ac22 100644
@@ -169,6 +169,80 @@
 #define CONFIG_SYS_FSL_USB_ADDR CONFIG_SYS_MPC512x_USB_ADDR
 #endif
 
+#if defined(CONFIG_MX25) || defined(CONFIG_MX31)
+#define USBCTRL_OTGBASE_OFFSET	0x600
+#endif
+
+#ifdef CONFIG_MX25
+#define MX25_USB_CTRL_IP_PUE_DOWN_BIT	(1<<6)
+#define MX25_USB_CTRL_HSTD_BIT		(1<<5)
+#define MX25_USB_CTRL_USBTE_BIT	(1<<4)
+#define MX25_USB_CTRL_OCPOL_OTG_BIT	(1<<3)
+#endif
+
+#ifdef CONFIG_MX31
+#define MX31_H2_SIC_SHIFT	21
+#define MX31_H2_SIC_MASK	(0x3 << MX31_H2_SIC_SHIFT)
+#define MX31_H2_PM_BIT		(1 << 16)
+#define MX31_H2_DT_BIT		(1 << 5)
+
+#define MX31_H1_SIC_SHIFT	13
+#define MX31_H1_SIC_MASK	(0x3 << MX31_H1_SIC_SHIFT)
+#define MX31_H1_PM_BIT		(1 << 8)
+#define MX31_H1_DT_BIT		(1 << 4)
+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
+/* offset for first USB CTRL register */
+#define MX5_CTRL_REGS_OFFSET	0x800
+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX31)
+/* USB_CTRL register bits of interest*/
+#define MXC_OTG_SIC_SHIFT	29
+#define MXC_OTG_SIC_MASK	(0x3 << MX31_OTG_SIC_SHIFT)
+#define MXC_OTG_WUE		(1 << 27)
+#define MXC_OTG_PM		(1 << 24)
+#endif
+
+#ifdef CONFIG_MX51
+#define MX51_REGISTER_LAYOUT_LENGTH	0x200
+
+/* Register offsets for MX51 */
+#define MX51_OTG_ID	0x000
+#define MX51_UH1_ID	0x200
+#define MX51_UH2_ID	0x400
+
+/* USB_CTRL register bits of interest*/
+#define MX51_OTG_PM		(1 << 24)
+#define MX51_H1_ULPI_IE	(1 << 12)
+#define MX51_H1_WUE		(1 << 11)
+#define MX51_H1_PM		(1 << 8)
+
+/* PHY_CTRL_0 register bits of interest */
+#define MX51_OTG_OVERCURD	(1 << 8)
+#define MX51_EHCI_POWERPINSE	(1 << 5)
+
+/* PHY_CTRL_1 register bits of interest */

include/usb/ehci-fsl.h +5 -1

+/* USBCMD bits of interest */
+#define MX51_ITC_IMMEDIATE_MASK	(0xff << 16)
+#endif
+
 /*
  * USB Registers
  */

@@ -210,7 +284,7 @@ struct usb_ehci {
 	u32	txfilltuning;	/* 0x164 - Host TT Transmit
 					   pre-buffer packet tuning */
 	u8	res7[0x8];
-	u32	ulpi_viewpoint;	/* 0x170 - ULPI Reister Access */
+	u32	ulpi_viewport;	/* 0x170 - ULPI Register Access */
 	u8	res8[0xc];
 	u32	config_flag;	/* 0x180 - Configured Flag Register */
 	u32	portsc;		/* 0x184 - Port status/control */

@@ -242,4 +316,14 @@ struct usb_ehci {
 	u8	res13[0xafc];
 };

Quoted 57 lines

include/usb/ehci-fsl.h +55 -0

+#if defined(CONFIG_MX25) || defined(CONFIG_MX31)
+#define USBCTRL_OTGBASE_OFFSET       0x600
+#endif
+
+#ifdef CONFIG_MX25
+#define MX25_USB_CTRL_IP_PUE_DOWN_BIT        (1<<6)
+#define MX25_USB_CTRL_HSTD_BIT               (1<<5)
+#define MX25_USB_CTRL_USBTE_BIT      (1<<4)
+#define MX25_USB_CTRL_OCPOL_OTG_BIT  (1<<3)
+#endif
+
+#ifdef CONFIG_MX31
+#define MX31_H2_SIC_SHIFT    21
+#define MX31_H2_SIC_MASK     (0x3 << MX31_H2_SIC_SHIFT)
+#define MX31_H2_PM_BIT               (1 << 16)
+#define MX31_H2_DT_BIT               (1 << 5)
+
+#define MX31_H1_SIC_SHIFT    13
+#define MX31_H1_SIC_MASK     (0x3 << MX31_H1_SIC_SHIFT)
+#define MX31_H1_PM_BIT               (1 << 8)
+#define MX31_H1_DT_BIT               (1 << 4)
+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
+/* offset for first USB CTRL register */
+#define MX5_CTRL_REGS_OFFSET 0x800
+#endif
+
+#if defined(CONFIG_MX51) || defined(CONFIG_MX31)
+/* USB_CTRL register bits of interest*/
+#define MXC_OTG_SIC_SHIFT    29
+#define MXC_OTG_SIC_MASK     (0x3 << MX31_OTG_SIC_SHIFT)
+#define MXC_OTG_WUE          (1 << 27)
+#define MXC_OTG_PM           (1 << 24)
+#endif
+
+#ifdef CONFIG_MX51
+#define MX51_REGISTER_LAYOUT_LENGTH  0x200
+
+/* Register offsets for MX51 */
+#define MX51_OTG_ID  0x000
+#define MX51_UH1_ID  0x200
+#define MX51_UH2_ID  0x400
+
+/* USB_CTRL register bits of interest*/
+#define MX51_OTG_PM          (1 << 24)
+#define MX51_H1_ULPI_IE      (1 << 12)
+#define MX51_H1_WUE          (1 << 11)
+#define MX51_H1_PM           (1 << 8)
+
+/* PHY_CTRL_0 register bits of interest */
+#define MX51_OTG_OVERCURD    (1 << 8)
+#define MX51_EHCI_POWERPINSE (1 << 5)
+
+/* PHY_CTRL_1 register bits of interest */

include/usb/ehci-fsl.h line 236

Quoted 10 lines

include/usb/ehci-fsl.h +10 -0

+#define MX51_SYSCLOCK_24_MHZ (1 << 0)
+#define MX51_SYSCLOCK_MASK   (~(0xffffffff << 2))
+
+/* USB_CTRL_1 register bits of interest */
+#define MX51_H1_EXTCLKE      (1 << 25)
+
+/* USB Host 2 CTRL register bits of interest */
+#define MX51_H2_ULPI_IE      (1 << 8)
+#define MX51_H2_WUE          (1 << 7)
+#define MX51_H2_PM           (1 << 4)

Most of the definitions above are arch specific and would better be placed in arch/arm/include/asm/arch-mx25/31/5, I think.

Stefano, what do you think? You said that these definitions could be in

include/usb/ehci-fsl.h line 240

Quoted 3 lines

include/usb/ehci-fsl.h +3 -0

+/* PORTSCx bits of interest */
+#define MX51_ULPI_MODE_MASK  (2 << 30)
+#define MX51_16BIT_UTMI      (1 << 28)

In ehci-fsl.h we have already

#define PORT_PTS_ULPI (2 << 30)
#define PORT_PTS_PTW (1 << 28)

Ok, I'll use them.

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
 board/efikamx/Makefile      |    3 +
 board/efikamx/efika.h       |   30 +++
 board/efikamx/efikamx-usb.c |  420
+++++++++++++++++++++++++++++++++++++++++++ board/efikamx/efikamx.c     | 
  3 +
 include/configs/efikamx.h   |   16 ++
 5 files changed, 472 insertions(+), 0 deletions(-)
 create mode 100644 board/efikamx/efika.h
 create mode 100644 board/efikamx/efikamx-usb.c

board/efikamx/efikamx-usb.c new file +8 -0

+
+int ulpi_wakeup(struct usb_ehci *ehci)
+{
+	if (readl(&ehci->ulpi_viewpoint) & ULPI_SS)
+		return 0; /* already awake */
+	return ulpi_wait(ehci, ULPI_WU, ULPI_WU);
+}
+

(quoted diff) +2 -0

+	return ulpi_read_mask(readl(&ehci->ulpi_viewpoint));
+}

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes

 board/efikamx/Makefile      |    3 +
 board/efikamx/efika.h       |   30 +++
 board/efikamx/efikamx-usb.c |  423
+++++++++++++++++++++++++++++++++++++++++++ board/efikamx/efikamx.c     | 
  3 +
 include/configs/efikamx.h   |   16 ++
 5 files changed, 475 insertions(+), 0 deletions(-)
 create mode 100644 board/efikamx/efika.h
 create mode 100644 board/efikamx/efikamx-usb.c

board/efikamx/Makefile +3 -0

index ee4a16e..860e4d2 100644
@@ -28,6 +28,9 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).o
 
 COBJS	:= efikamx.o
+ifdef	CONFIG_CMD_USB
+COBJS	+= efikamx-usb.o
+endif
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

board/efikamx/efika.h new file +20 -0

new file mode 100644
index 0000000..b3532e2
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2011 Jana Rapava <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
Changes for v2:
? ? ? ? ? ? ? - introduce temporary variable in ulpi_write ? ? ? ? ? ? ? - whitespace changes
Changes for v3:
??? - add protection against multiple inclusion of efika.h

?  board/efikamx/Makefile? ? ? ? ?  |? ? ?  3 +
?  board/efikamx/efika.h? ? ? ? ? ?  |? ?  33 ++++
?  board/efikamx/efikamx-usb.c |?  423
+++++++++++++++++++++++++++++++++++++++++++ board/efikamx/efikamx.c? ? ?  
|? ? ?  3 + include/configs/efikamx.h? ?  |? ?  16 ++
?  5 files changed, 478 insertions(+), 0 deletions(-)
?  create mode 100644 board/efikamx/efika.h
?  create mode 100644 board/efikamx/efikamx-usb.c

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
Changes for v2:
? ? ? ? ? ? - introduce temporary variable in ulpi_write ? ? ? ? ? ? - whitespace changes
Changes for v3:
? ? ? ? ? ? ? - add protection against multiple inclusion of efika.h Changes for v4:
??? - rename multiple inclusion protection macro in efika.h

?  board/efikamx/Makefile? ? ? ? ?  |? ? ?  3 +
?  board/efikamx/efika.h? ? ? ? ? ?  |? ?  33 ++++
?  board/efikamx/efikamx-usb.c |?  423
+++++++++++++++++++++++++++++++++++++++++++ board/efikamx/efikamx.c? ? ?  
|? ? ?  3 + include/configs/efikamx.h? ?  |? ?  16 ++
?  5 files changed, 478 insertions(+), 0 deletions(-)
?  create mode 100644 board/efikamx/efika.h
?  create mode 100644 board/efikamx/efikamx-usb.c

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes
Changes for v3:
- add protection against multiple inclusion of efika.h
Changes for v4:
- rename multiple inclusion protection macro in efika.h
Changes for v5:
- fix unterminated #ifndef in efika.h

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Acked-by Marek Vasut <[email protected]>

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Acked-by Marek Vasut <[email protected]>

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes
Changes for v3:
- add protection against multiple inclusion of efika.h
Changes for v4:
- rename multiple inclusion protection macro in efika.h
Changes for v5:
- fix unterminated #ifndef in efika.h
Changes for v6:
- add Acked-by
- no changes

Quoted 8 lines

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Acked-by Marek Vasut <[email protected]>

Quoted 14 lines

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes
Changes for v3:
- add protection against multiple inclusion of efika.h
Changes for v4:
- rename multiple inclusion protection macro in efika.h
Changes for v5:
- fix unterminated #ifndef in efika.h
Changes for v6:
- add Acked-by
- no changes

Guys, there's been no update on this for a month.

Stefano, can you apply please? I see no negative comments.

Quoted 23 lines · Marek Vasut

Quoted 22 lines

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Acked-by Marek Vasut <[email protected]>

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes
Changes for v3:
- add protection against multiple inclusion of efika.h
Changes for v4:
- rename multiple inclusion protection macro in efika.h
Changes for v5:
- fix unterminated #ifndef in efika.h
Changes for v6:
- add Acked-by
- no changes

Quoted 3 lines

Guys, there's been no update on this for a month.

Stefano, can you apply please? I see no negative comments.

I do not have seen any open issues, too. If nobody argues and because they are related to USB for i.MX boards, I will apply them to u-boot-imx.

Best regards,
Stefano Babic

Hi Stefano,

Quoted 2 lines

I do not have seen any open issues, too. If nobody argues and because they are related to USB for i.MX boards, I will apply them to u-boot-imx.

Sorry for jumping in that late.
I've just got back from my trip.
There are some issues with: [PATCH 3/4] EHCI: adjust for mx5 If you have already applied it

and also because I don't want
to block this patch set, the issues I've pointed can be fixed in a follow up patch.

Quoted 2 lines

There are some issues with: [PATCH 3/4] EHCI: adjust for mx5 If you have already applied it

Jana, can you answer / fix this point ?

2011/10/31 Stefano Babic <sbabic at denx.de <mailto:[email protected]>>

Quoted 2 lines

There are some issues with: [PATCH 3/4] EHCI: adjust for mx5 If you have already applied it

Jana, can you answer / fix this point ?

I really don't know what happens there. Code file looks aligned, but when I generate a patch with git-format-patch, aligning is messed up.

So
I fix it in git-send-email,

but after sending whitespace characters are
messed up again.
I wasn't able to find a way to fix it yet.

This commit adds USB support for EfikaMX and EfikaSB.

Signed-off-by Jana Rapava <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Remy Bohmer <[email protected]>

Cc Stefano Babic <[email protected]>

Acked-by Marek Vasut <[email protected]>

---
Changes for v2:
- introduce temporary variable in ulpi_write
- whitespace changes
Changes for v3:
- add protection against multiple inclusion of efika.h
Changes for v4:
- rename multiple inclusion protection macro in efika.h
Changes for v5:
- fix unterminated #ifndef in efika.h
Changes for v6:
- add Acked-by
- no changes
Changes for v7:
- use ULPI-related definitions from ./include/usb/ulpi.h

 board/efikamx/Makefile      |    3 +
 board/efikamx/efika.h       |   35 ++++
 board/efikamx/efikamx-usb.c |  424 +++++++++++++++++++++++++++++++++++++++++++
 board/efikamx/efikamx.c     |    3 +
 include/configs/efikamx.h   |   16 ++
 5 files changed, 481 insertions(+), 0 deletions(-)
 create mode 100644 board/efikamx/efika.h
 create mode 100644 board/efikamx/efikamx-usb.c

board/efikamx/Makefile +3 -0

index ee4a16e..860e4d2 100644
@@ -28,6 +28,9 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).o
 
 COBJS	:= efikamx.o
+ifdef	CONFIG_CMD_USB
+COBJS	+= efikamx-usb.o
+endif
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

board/efikamx/efika.h new file +35 -0

new file mode 100644
index 0000000..fec9ee0
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 Jana Rapava <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __BOARD_EFIKAMX_EFIKA_H__
+#define __BOARD_EFIKAMX_EFIKA_H__
+
+/*
+ * EHCI USB
+ */
+#ifdef	CONFIG_CMD_USB
+void setup_iomux_usb(void);
+#else
+static inline void setup_iomux_usb(void) { }
+#endif
+
+#endif /* __BOARD_EFIKAMX_EFIKA_H__ */

board/efikamx/efikamx-usb.c new file +414 -0

new file mode 100644
index 0000000..3b42256
@@ -0,0 +1,424 @@
+/*
+ * Copyright (C) 2011 Marek Vasut <[email protected]>
+ * Copyright (C) 2011 Jana Rapava <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <usb.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/mx5x_pins.h>
+#include <asm/arch/iomux.h>
+#include <asm/gpio.h>
+#include <usb/ehci-fsl.h>
+#include <errno.h>
+#include <watchdog.h>
+
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
+#include <usb/ulpi.h>
+
+/*
+ * Configure the USB H1 and USB H2 IOMUX.
+ */
+#define USB_PAD_CONFIG	(PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST | \
+			PAD_CTL_DRV_HIGH | PAD_CTL_100K_PU | \
+			PAD_CTL_HYS_ENABLE | PAD_CTL_PUE_PULL)
+void setup_iomux_usb(void)
+{
+	/*
+	 * Configure USBH1 pads
+	 */
+	mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_CLK, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_CLK, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DIR, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DIR, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_NXT, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_NXT, USB_PAD_CONFIG);
+
+	mxc_request_iomux(MX51_PIN_USBH1_DATA0, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA0, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA1, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA1, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA2, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA2, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA3, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA3, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA4, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA4, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA5, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA5, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA6, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA6, USB_PAD_CONFIG);
+	mxc_request_iomux(MX51_PIN_USBH1_DATA7, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_DATA7, USB_PAD_CONFIG);
+
+	/*
+	 * Configure USBH1 control pads
+	 */
+
+	/* USB PHY reset */
+	mxc_request_iomux(MX51_PIN_EIM_D27, IOMUX_CONFIG_ALT1);
+	mxc_iomux_set_pad(MX51_PIN_EIM_D27, PAD_CTL_PKE_ENABLE |
+			PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH);
+
+	/* USB HUB reset */
+	mxc_request_iomux(MX51_PIN_GPIO1_5, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_GPIO1_5, PAD_CTL_PKE_ENABLE |
+			PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH);
+
+
+	if (machine_is_efikasb()) {
+		/*
+		 * Configure USBH2 pads (used on EfikaSB)
+		 */
+		/* USBH2_DATA */
+		mxc_request_iomux(MX51_PIN_EIM_D16, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D16, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D17, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D17, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D18, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D18, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D19, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D19, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D20, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D20, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D21, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D21, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D22, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D22, USB_PAD_CONFIG);
+		mxc_request_iomux(MX51_PIN_EIM_D23, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_D23, USB_PAD_CONFIG);
+
+		/* USBH2_CLK */
+		mxc_request_iomux(MX51_PIN_EIM_A24, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_A24, USB_PAD_CONFIG);
+		/* USBH2_DIR */
+		mxc_request_iomux(MX51_PIN_EIM_A25, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_A25, USB_PAD_CONFIG);
+		/* USBH2_STP */
+		mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_A26, USB_PAD_CONFIG);
+		/* USBH2_NXT */
+		mxc_request_iomux(MX51_PIN_EIM_A27, IOMUX_CONFIG_ALT2);
+		mxc_iomux_set_pad(MX51_PIN_EIM_A27, USB_PAD_CONFIG);
+	}
+
+	/* WIFI EN (act low) */
+	mxc_request_iomux(MX51_PIN_EIM_A22, IOMUX_CONFIG_GPIO);
+	mxc_iomux_set_pad(MX51_PIN_EIM_A22, 0);
+	/* WIFI RESET */
+	mxc_request_iomux(MX51_PIN_EIM_A16, IOMUX_CONFIG_GPIO);
+	mxc_iomux_set_pad(MX51_PIN_EIM_A16, 0);
+	/* BT EN (act low) */
+	mxc_request_iomux(MX51_PIN_EIM_A17, IOMUX_CONFIG_GPIO);
+	mxc_iomux_set_pad(MX51_PIN_EIM_A17, 0);
+}
+
+/*
+ * Enable devices connected to USB buses.
+ */
+void efika_usb_enable_devices(void)
+{
+	/* Enable Bluetooth */
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A17), 0);
+	udelay(10000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A17), 1);
+
+	/* Enable WiFi */
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A22), 1);
+	udelay(10000);
+
+	/* Reset the WiFi chip */
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A16), 0);
+	udelay(10000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A16), 1);
+}
+
+/*
+ * Reset USB HUB (or HUBs on EfikaSB).
+ */
+void efika_usb_hub_reset(void)
+{
+	/* HUB reset */
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 1);
+	udelay(1000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 0);
+	udelay(1000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_5), 1);
+}
+
+/*
+ * Reset USB PHY (or PHYs on EfikaSB).
+ */
+void efika_usb_phy_reset(void)
+{
+	/* SMSC 3317 PHY reset */
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_D27), 0);
+	udelay(1000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_D27), 1);
+}
+
+/*
+ * Configure control registers of the USB controller.
+ */
+void control_regs_setup(struct mx5_usb_control_regs *control)
+{
+	clrsetbits_le32(&control->usbctrl,
+		(MXC_OTG_WUE | MXC_OTG_PM | MX51_H1_ULPI_IE | MX51_H1_WUE),
+		MX51_H1_PM);
+
+	clrsetbits_le32(&control->phyctrl0,
+			MX51_OTG_OVERCURD,
+			MX51_EHCI_POWERPINSE);
+
+	clrsetbits_le32(&control->phyctrl1,
+			MX51_SYSCLOCK_MASK,
+			MX51_SYSCLOCK_24_MHZ);
+
+	setbits_le32(&control->usbctrl1, MX51_H1_EXTCLKE);
+
+	clrsetbits_le32(&control->uh2ctrl,
+			(MX51_H2_ULPI_IE | MX51_H2_WUE),
+			MX51_H2_PM);
+
+	udelay(10000);
+}
+
+#define ULPI_ADDR_SHIFT		16
+#define ulpi_write_mask(value)	((value) & 0xff)
+#define ulpi_read_mask(value)	(((value) >> 8) & 0xff)
+
+int ulpi_wait(struct usb_ehci *ehci, u32 ulpi_value, u32 ulpi_mask)
+{
+	int timeout = ULPI_TIMEOUT;
+	u32 tmp;
+
+	writel(ulpi_value, &ehci->ulpi_viewpoint);
+
+	/* Wait for the bits in ulpi_mask to become zero. */
+	while (--timeout) {
+		tmp = readl(&ehci->ulpi_viewpoint);
+		if (!(tmp & ulpi_mask))
+			break;
+		WATCHDOG_RESET();
+	}
+
+	return !timeout;
+}
+
+int ulpi_wakeup(struct usb_ehci *ehci)
+{
+	if (readl(&ehci->ulpi_viewpoint) & ULPI_SS)
+		return 0; /* already awake */
+	return ulpi_wait(ehci, ULPI_WU, ULPI_WU);
+}
+
+void ulpi_write(struct usb_ehci *ehci, u32 reg, u32 value)
+{
+	u32 tmp;
+	if (ulpi_wakeup(ehci)) {
+		printf("ULPI wakeup timed out\n");
+		return;
+	}
+
+	tmp = ulpi_wait(ehci, ULPI_RWRUN | ULPI_RWCTRL |
+		reg << ULPI_ADDR_SHIFT | ulpi_write_mask(value), ULPI_RWRUN);
+	if (tmp)
+		printf("ULPI write timed out\n");
+}
+
+u32 ulpi_read(struct usb_ehci *ehci, u32 reg)
+{
+	if (ulpi_wakeup(ehci)) {
+		printf("ULPI wakeup timed out\n");
+		return 0;
+	}
+
+	if (ulpi_wait(ehci, ULPI_RWRUN | reg << ULPI_ADDR_SHIFT, ULPI_RWRUN)) {
+		printf("ULPI read timed out\n");
+		return 0;
+	}
+
+	return ulpi_read_mask(readl(&ehci->ulpi_viewpoint));
+}
+
+void ulpi_init(struct usb_ehci *ehci, struct ulpi_regs *ulpi)
+{
+	u32 tmp = 0;
+	int reg, i;
+
+	/* Assemble ID from four ULPI ID registers (8 bits each). */
+	for (reg = ULPI_ID_REGS_COUNT - 1; reg >= 0; reg--)
+		tmp |= ulpi_read(ehci, reg) << (reg * 8);
+
+	/* Split ID into vendor and product ID. */
+	debug("Found ULPI TX, ID %04x:%04x\n", tmp >> 16, tmp & 0xffff);
+
+	/* ULPI integrity check */
+	for (i = 0; i < 2; i++) {
+		ulpi_write(ehci, (u32)&ulpi->scratch_write,
+			ULPI_TEST_VALUE << i);
+		tmp = ulpi_read(ehci, (u32)&ulpi->scratch_write);
+
+		if (tmp != (ULPI_TEST_VALUE << i)) {
+			printf("ULPI integrity check failed\n");
+			return;
+		}
+	}
+
+	/* Set ULPI flags. */
+	ulpi_write(ehci, (u32)&ulpi->otg_ctrl_write,
+		ULPI_OTG_EXTVBUSIND |
+		ULPI_OTG_DM_PULLDOWN | ULPI_OTG_DP_PULLDOWN);
+	ulpi_write(ehci, (u32)&ulpi->function_ctrl_write,
+		ULPI_FC_XCVRSEL | ULPI_FC_OPMODE_NORMAL |
+		ULPI_FC_SUSPENDM);
+	ulpi_write(ehci, (u32)&ulpi->iface_ctrl_write, 0);
+	ulpi_write(ehci, (u32)&ulpi->otg_ctrl_set,
+		ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
+
+	/*
+	 * NOTE: This violates USB specification, but otherwise, USB on Efika
+	 * doesn't charge VBUS and as a result, USB doesn't work.
+	 */
+	ulpi_write(ehci, (u32)&ulpi->otg_ctrl_set, ULPI_OTG_CHRGVBUS);
+}
+
+/*
+ * Solve the VBUS reset problem on Efika
+ * by setting the CHRG_VBUS bit in the reset.
+ */
+void ehci_fixup(uint32_t *status_reg, uint32_t *reg_ref)
+{
+	struct usb_ehci *ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
+		MX51_REGISTER_LAYOUT_LENGTH);
+	struct ulpi_regs *ulpi = (struct ulpi_regs *)0;
+
+	u32 tmp = ulpi_read(ehci, (u32)&ulpi->otg_ctrl_write);
+	tmp |= ULPI_OTG_CHRGVBUS;
+	ulpi_write(ehci, (u32)&ulpi->otg_ctrl_write, tmp);
+
+	/* USB 2.0 specification say 50 ms resets on root. */
+	wait_ms(50);
+
+	/* Now terminate the reset. */
+	*reg_ref = ehci_readl(status_reg);
+	*reg_ref |= EHCI_PS_PE;
+}
+
+void ehci0_init(struct usb_ehci *ehci)
+{
+	writel(MX51_16BIT_UTMI, &ehci->portsc);
+}
+
+void ehci1_init(struct usb_ehci *ehci, struct ulpi_regs *ulpi)
+{
+	mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT2);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_STP, PAD_CTL_DRV_HIGH |
+				PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_USBH1_STP), 0);
+	udelay(1000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_USBH1_STP), 1);
+	udelay(1000);
+
+	mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0);
+	mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USB_PAD_CONFIG);
+	udelay(10000);
+
+	clrbits_le32(&ehci->usbcmd, MX51_ITC_IMMEDIATE_MASK);
+	udelay(10000);
+
+	writel(MX51_ULPI_MODE_MASK, &ehci->portsc);
+	udelay(10000);
+
+	ulpi_init(ehci, ulpi);
+}
+
+void ehci2_init(struct usb_ehci *ehci, struct ulpi_regs *ulpi)
+{
+	mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT1);
+	mxc_iomux_set_pad(MX51_PIN_EIM_A26, PAD_CTL_DRV_HIGH |
+				PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
+	gpio_direction_output(IOMUX_TO_GPIO(MX51_PIN_EIM_A26), 0);
+	udelay(1000);
+	gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_EIM_A26), 1);
+	udelay(1000);
+
+	mxc_request_iomux(MX51_PIN_EIM_A26, IOMUX_CONFIG_ALT2);
+	mxc_iomux_set_pad(MX51_PIN_EIM_A26, USB_PAD_CONFIG);
+
+	writel(MX51_ULPI_MODE_MASK, &ehci->portsc);
+	udelay(10000);
+
+	ulpi_init(ehci, ulpi);
+}
+
+int ehci_hcd_init(void)
+{
+	struct usb_ehci *ehci;
+	struct mx5_usb_control_regs *mx5_usb_control_regs;
+	struct ulpi_regs *ulpi;
+
+	mx5_usb_control_regs = (struct mx5_usb_control_regs *)(OTG_BASE_ADDR +
+		 MX5_CTRL_REGS_OFFSET);
+	control_regs_setup(mx5_usb_control_regs);
+	ulpi = (struct ulpi_regs *)0;
+
+	/* Init EHCI core */
+	ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
+		(MX51_REGISTER_LAYOUT_LENGTH * CONFIG_MXC_USB_PORT));
+	hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
+	hcor = (struct ehci_hcor *)((uint32_t) hccr +
+			HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+	setbits_le32(&ehci->usbmode, CM_HOST);
+	setbits_le32(&ehci->control, USB_EN);
+
+	/* Init iMX51 EHCI */
+	efika_usb_phy_reset();
+	efika_usb_hub_reset();
+	efika_usb_enable_devices();
+
+	switch (CONFIG_MXC_USB_PORT) {
+	case 0:
+		ehci0_init(ehci);
+		break;
+	case 1:
+		ehci1_init(ehci, ulpi);
+		break;
+	case 2:
+		if (machine_is_efikasb())
+			ehci2_init(ehci, ulpi);
+		break;
+	};
+

Hi Jana,

Quoted 6 lines · Jana Rapava

board/efikamx/efika.h new file +0 -0

new file mode 100644
index 0000000..fec9ee0

board/efikamx/efikamx-usb.c

Quoted 6 lines

board/efikamx/efikamx-usb.c new file +0 -0

new file mode 100644
index 0000000..3b42256

Most of the functions and defines above aren't board specific, right? It would be a good thing to put them in an SoC specific location, so any other board using that SoC can benefit from them.

I don't want to block on that issue, so if it simplifies you a further ULPI patches submission - I don't care if you leave it here and in the next patch set move to a common location.

Although the proper way would be to submit the framework(s) and then adjust the users.

Ok, so non-board-specific parts should go into ./arch/arm/cpu/armv7/mx5/ and board-specific callbacks should stay here? Do I understand you well?

Quoted 7 lines

I don't want to block on that issue, so if it simplifies you a further ULPI patches submission - I don't care if you leave it here and in the next patch set move to a common location.

Thanks.

Quoted 3 lines · Jana Rapava

Ok, so non-board-specific parts should go into ./arch/arm/cpu/armv7/mx5/ and board-specific callbacks should stay here? Do I understand you well?

Yes, I think so

Quoted 7 lines

Quoted 7 lines

I don't want to block on that issue, so if it simplifies you a further ULPI patches submission - I don't care if you leave it here and in the next patch set move to a common location.

Quoted 1 line

Thanks.

Anyway, as we agree, it is really better to do now the right thing as to postpone.