[PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support

[PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support

[Keshava Munegowda]

This series does minor code cleanup in preparation of an upcoming
series to add support for EHCI and OHCI on the OMAP4 SoC.

The changes are:
- Rename clock names to be consistent across OMAP3 and OMAP4
- Remove hardcoding of the number of TLL channels
- Move PHY reset earlier in the init sequence

These patches do not make any changes to existing functionalities.

Diffstat is below:

drivers/usb/host/ehci-omap.c                   |  104 ++++++++++++-------------
drivers/usb/host/ohci-omap3.c                  |   55 ++++++-------
2 files changed
---
Keshava

[PATCH 1/5] usb: ehci: omap: Update clock names to be same across OMAP3 and OMAP4

[Keshava Munegowda]

Rename usbhost2_120m_fck to usbhost_hs_fck and
usbhost1_48m_fck to usbhost_fs_fck, so that we can reuse the
names across OMAP3 and OMAP4.

OMAP3 and OMAP4 have similar clocks, with different frequencies.
The driver should not need to care about these.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-omap.c |   56 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

Index: linux-2.6/drivers/usb/host/ehci-omap.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/ehci-omap.c
+++ linux-2.6/drivers/usb/host/ehci-omap.c
@@ -156,8 +156,8 @@ struct ehci_hcd_omap {
 	struct device		*dev;
 
 	struct clk		*usbhost_ick;
-	struct clk		*usbhost2_120m_fck;
-	struct clk		*usbhost1_48m_fck;
+	struct clk		*usbhost_hs_fck;
+	struct clk		*usbhost_fs_fck;
 	struct clk		*usbtll_fck;
 	struct clk		*usbtll_ick;
 
@@ -286,19 +286,19 @@ static int omap_start_ehc(struct ehci_hc
 	}
 	clk_enable(omap->usbhost_ick);
 
-	omap->usbhost2_120m_fck = clk_get(omap->dev, "usbhost_120m_fck");
-	if (IS_ERR(omap->usbhost2_120m_fck)) {
-		ret = PTR_ERR(omap->usbhost2_120m_fck);
-		goto err_host_120m_fck;
-	}
-	clk_enable(omap->usbhost2_120m_fck);
-
-	omap->usbhost1_48m_fck = clk_get(omap->dev, "usbhost_48m_fck");
-	if (IS_ERR(omap->usbhost1_48m_fck)) {
-		ret = PTR_ERR(omap->usbhost1_48m_fck);
-		goto err_host_48m_fck;
+	omap->usbhost_hs_fck = clk_get(omap->dev, "usbhost_120m_fck");
+	if (IS_ERR(omap->usbhost_hs_fck)) {
+		ret = PTR_ERR(omap->usbhost_hs_fck);
+		goto err_host_hs_fck;
+	}
+	clk_enable(omap->usbhost_hs_fck);
+
+	omap->usbhost_fs_fck = clk_get(omap->dev, "usbhost_48m_fck");
+	if (IS_ERR(omap->usbhost_fs_fck)) {
+		ret = PTR_ERR(omap->usbhost_fs_fck);
+		goto err_host_fs_fck;
 	}
-	clk_enable(omap->usbhost1_48m_fck);
+	clk_enable(omap->usbhost_fs_fck);
 
 	if (omap->phy_reset) {
 		/* Refer: ISSUE1 */
@@ -472,8 +472,8 @@ err_tll_ick:
 	clk_put(omap->usbtll_fck);
 
 err_tll_fck:
-	clk_disable(omap->usbhost1_48m_fck);
-	clk_put(omap->usbhost1_48m_fck);
+	clk_disable(omap->usbhost_fs_fck);
+	clk_put(omap->usbhost_fs_fck);
 
 	if (omap->phy_reset) {
 		if (gpio_is_valid(omap->reset_gpio_port[0]))
@@ -483,11 +483,11 @@ err_tll_fck:
 			gpio_free(omap->reset_gpio_port[1]);
 	}
 
-err_host_48m_fck:
-	clk_disable(omap->usbhost2_120m_fck);
-	clk_put(omap->usbhost2_120m_fck);
+err_host_fs_fck:
+	clk_disable(omap->usbhost_hs_fck);
+	clk_put(omap->usbhost_hs_fck);
 
-err_host_120m_fck:
+err_host_hs_fck:
 	clk_disable(omap->usbhost_ick);
 	clk_put(omap->usbhost_ick);
 
@@ -550,16 +550,16 @@ static void omap_stop_ehc(struct ehci_hc
 		omap->usbhost_ick = NULL;
 	}
 
-	if (omap->usbhost1_48m_fck != NULL) {
-		clk_disable(omap->usbhost1_48m_fck);
-		clk_put(omap->usbhost1_48m_fck);
-		omap->usbhost1_48m_fck = NULL;
+	if (omap->usbhost_fs_fck != NULL) {
+		clk_disable(omap->usbhost_fs_fck);
+		clk_put(omap->usbhost_fs_fck);
+		omap->usbhost_fs_fck = NULL;
 	}
 
-	if (omap->usbhost2_120m_fck != NULL) {
-		clk_disable(omap->usbhost2_120m_fck);
-		clk_put(omap->usbhost2_120m_fck);
-		omap->usbhost2_120m_fck = NULL;
+	if (omap->usbhost_hs_fck != NULL) {
+		clk_disable(omap->usbhost_hs_fck);
+		clk_put(omap->usbhost_hs_fck);
+		omap->usbhost_hs_fck = NULL;
 	}
 
 	if (omap->usbtll_ick != NULL) {
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/5] usb: ehci: don't hard-code TLL channel count.

[Keshava Munegowda]

Make TLL channel count a parameter instead of a hardcoded value.
This allows us to be flexible with future OMAP revisions which
could have a different number of channels.

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---
 drivers/usb/host/ehci-omap.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Index: linux-2.6/drivers/usb/host/ehci-omap.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/ehci-omap.c
+++ linux-2.6/drivers/usb/host/ehci-omap.c
@@ -191,13 +191,14 @@ struct ehci_hcd_omap {
 
 /*-------------------------------------------------------------------------*/
 
-static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
+static void omap_usb_utmi_init(struct ehci_hcd_omap *omap,
+				u8 tll_channel_mask, u8 tll_channel_count)
 {
 	unsigned reg;
 	int i;
 
 	/* Program the 3 TLL channels upfront */
-	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
+	for (i = 0; i < tll_channel_count; i++) {
 		reg = ehci_omap_readl(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i));
 
 		/* Disable AutoIdle, BitStuffing and use SDR Mode */
@@ -217,7 +218,7 @@ static void omap_usb_utmi_init(struct eh
 	ehci_omap_writel(omap->tll_base, OMAP_TLL_SHARED_CONF, reg);
 
 	/* Enable channels now */
-	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
+	for (i = 0; i < tll_channel_count; i++) {
 		reg = ehci_omap_readl(omap->tll_base, OMAP_TLL_CHANNEL_CONF(i));
 
 		/* Enable only the reg that is needed */
@@ -438,7 +439,7 @@ static int omap_start_ehc(struct ehci_hc
 			tll_ch_mask |= OMAP_TLL_CHANNEL_3_EN_MASK;
 
 		/* Enable UTMI mode for required TLL channels */
-		omap_usb_utmi_init(omap, tll_ch_mask);
+		omap_usb_utmi_init(omap, tll_ch_mask, OMAP_TLL_CHANNEL_COUNT);
 	}
 
 	if (omap->phy_reset) {

[PATCH 3/5] usb: ehci: relocate PHY reset code

[Keshava Munegowda]

The PHY reset code is moved at the begining and end of the function
omap_start_ehc. This simplfies the writing clocks enabling code for 
OMAP4 later. 

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-omap.c |   52 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Index: linux-2.6/drivers/usb/host/ehci-omap.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/ehci-omap.c
+++ linux-2.6/drivers/usb/host/ehci-omap.c
@@ -279,6 +279,24 @@ static int omap_start_ehc(struct ehci_hc
 
 	dev_dbg(omap->dev, "starting TI EHCI USB Controller\n");
 
+	if (omap->phy_reset) {
+		/* Refer: ISSUE1 */
+		if (gpio_is_valid(omap->reset_gpio_port[0])) {
+			gpio_request(omap->reset_gpio_port[0],
+						"USB1 PHY reset");
+			gpio_direction_output(omap->reset_gpio_port[0], 0);
+		}
+
+		if (gpio_is_valid(omap->reset_gpio_port[1])) {
+			gpio_request(omap->reset_gpio_port[1],
+						"USB2 PHY reset");
+			gpio_direction_output(omap->reset_gpio_port[1], 0);
+		}
+
+		/* Hold the PHY in RESET for enough time till DIR is high */
+		udelay(10);
+	}
+
 	/* Enable Clocks for USBHOST */
 	omap->usbhost_ick = clk_get(omap->dev, "usbhost_ick");
 	if (IS_ERR(omap->usbhost_ick)) {
@@ -301,24 +319,6 @@ static int omap_start_ehc(struct ehci_hc
 	}
 	clk_enable(omap->usbhost_fs_fck);
 
-	if (omap->phy_reset) {
-		/* Refer: ISSUE1 */
-		if (gpio_is_valid(omap->reset_gpio_port[0])) {
-			gpio_request(omap->reset_gpio_port[0],
-						"USB1 PHY reset");
-			gpio_direction_output(omap->reset_gpio_port[0], 0);
-		}
-
-		if (gpio_is_valid(omap->reset_gpio_port[1])) {
-			gpio_request(omap->reset_gpio_port[1],
-						"USB2 PHY reset");
-			gpio_direction_output(omap->reset_gpio_port[1], 0);
-		}
-
-		/* Hold the PHY in RESET for enough time till DIR is high */
-		udelay(10);
-	}
-
 	/* Configure TLL for 60Mhz clk for ULPI */
 	omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck");
 	if (IS_ERR(omap->usbtll_fck)) {
@@ -476,14 +476,6 @@ err_tll_fck:
 	clk_disable(omap->usbhost_fs_fck);
 	clk_put(omap->usbhost_fs_fck);
 
-	if (omap->phy_reset) {
-		if (gpio_is_valid(omap->reset_gpio_port[0]))
-			gpio_free(omap->reset_gpio_port[0]);
-
-		if (gpio_is_valid(omap->reset_gpio_port[1]))
-			gpio_free(omap->reset_gpio_port[1]);
-	}

[PATCH 4/5] usb: ohci: omap: Update clock names to be same across OMAP3 and OMAP4

[Keshava Munegowda]

Rename usbhost2_120m_fck to usbhost_hs_fck and
usbhost1_48m_fck to usbhost_fs_fck, so that we can reuse the
names across OMAP3 and OMAP4.

OMAP3 and OMAP4 have similar clocks, with different frequencies.
The driver should not need to care about these.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ohci-omap3.c |   48 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Index: kernel-omap4-base/drivers/usb/host/ohci-omap3.c
===================================================================
--- kernel-omap4-base.orig/drivers/usb/host/ohci-omap3.c
+++ kernel-omap4-base/drivers/usb/host/ohci-omap3.c
@@ -135,8 +135,8 @@ struct ohci_hcd_omap3 {
 	struct device		*dev;
 
 	struct clk		*usbhost_ick;
-	struct clk		*usbhost2_120m_fck;
-	struct clk		*usbhost1_48m_fck;
+	struct clk		*usbhost_hs_fck;
+	struct clk		*usbhost_fs_fck;
 	struct clk		*usbtll_fck;
 	struct clk		*usbtll_ick;
 
@@ -157,11 +157,11 @@ static void ohci_omap3_clock_power(struc
 		clk_enable(omap->usbtll_ick);
 		clk_enable(omap->usbtll_fck);
 		clk_enable(omap->usbhost_ick);
-		clk_enable(omap->usbhost1_48m_fck);
-		clk_enable(omap->usbhost2_120m_fck);
+		clk_enable(omap->usbhost_fs_fck);
+		clk_enable(omap->usbhost_hs_fck);
 	} else {
-		clk_disable(omap->usbhost2_120m_fck);
-		clk_disable(omap->usbhost1_48m_fck);
+		clk_disable(omap->usbhost_hs_fck);
+		clk_disable(omap->usbhost_fs_fck);
 		clk_disable(omap->usbhost_ick);
 		clk_disable(omap->usbtll_fck);
 		clk_disable(omap->usbtll_ick);
@@ -297,18 +297,18 @@ static int omap3_start_ohci(struct ohci_
 		goto err_host_ick;
 	}
 
-	omap->usbhost2_120m_fck = clk_get(omap->dev, "usbhost_120m_fck");
-	if (IS_ERR(omap->usbhost2_120m_fck)) {
+	omap->usbhost_hs_fck = clk_get(omap->dev, "usbhost_120m_fck");
+	if (IS_ERR(omap->usbhost_hs_fck)) {
 		dev_err(omap->dev, "could not get usbhost_120m_fck\n");
-		ret = PTR_ERR(omap->usbhost2_120m_fck);
-		goto err_host_120m_fck;
+		ret = PTR_ERR(omap->usbhost_hs_fck);
+		goto err_host_hs_fck;
 	}
 
-	omap->usbhost1_48m_fck = clk_get(omap->dev, "usbhost_48m_fck");
-	if (IS_ERR(omap->usbhost1_48m_fck)) {
+	omap->usbhost_fs_fck = clk_get(omap->dev, "usbhost_48m_fck");
+	if (IS_ERR(omap->usbhost_fs_fck)) {
 		dev_err(omap->dev, "could not get usbhost_48m_fck\n");
-		ret = PTR_ERR(omap->usbhost1_48m_fck);
-		goto err_host_48m_fck;
+		ret = PTR_ERR(omap->usbhost_fs_fck);
+		goto err_host_fs_fck;
 	}
 
 	omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck");
@@ -434,12 +434,12 @@ err_tll_ick:
 	clk_put(omap->usbtll_fck);
 
 err_tll_fck:
-	clk_put(omap->usbhost1_48m_fck);
+	clk_put(omap->usbhost_fs_fck);
 
-err_host_48m_fck:
-	clk_put(omap->usbhost2_120m_fck);
+err_host_fs_fck:
+	clk_put(omap->usbhost_hs_fck);
 
-err_host_120m_fck:
+err_host_hs_fck:
 	clk_put(omap->usbhost_ick);
 
 err_host_ick:
@@ -501,14 +501,14 @@ static void omap3_stop_ohci(struct ohci_
 		omap->usbhost_ick = NULL;
 	}
 
-	if (omap->usbhost1_48m_fck != NULL) {
-		clk_put(omap->usbhost1_48m_fck);
-		omap->usbhost1_48m_fck = NULL;
+	if (omap->usbhost_fs_fck != NULL) {
+		clk_put(omap->usbhost_fs_fck);
+		omap->usbhost_fs_fck = NULL;
 	}
 
-	if (omap->usbhost2_120m_fck != NULL) {
-		clk_put(omap->usbhost2_120m_fck);
-		omap->usbhost2_120m_fck = NULL;
+	if (omap->usbhost_hs_fck != NULL) {
+		clk_put(omap->usbhost_hs_fck);
+		omap->usbhost_hs_fck = NULL;
 	}
 
 	if (omap->usbtll_ick != NULL) {
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Keshava Munegowda]

Make TLL channel count a parameter instead of a hardcoded value.
This allows us to be flexible with future OMAP revisions which
could have a different number of channels.

Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ohci-omap3.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: kernel-omap4-base/drivers/usb/host/ohci-omap3.c
===================================================================
--- kernel-omap4-base.orig/drivers/usb/host/ohci-omap3.c
+++ kernel-omap4-base/drivers/usb/host/ohci-omap3.c
@@ -245,7 +245,8 @@ static unsigned ohci_omap3_fslsmode(enum
 	}
 }
 
-static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap)
+static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap,
+					u8 tll_channel_count)
 {
 	u32 reg;
 	int i;
@@ -263,7 +264,7 @@ static void ohci_omap3_tll_config(struct
 	 * REVISIT: Only the 3-pin and 4-pin PHY modes have
 	 * actually been tested.
 	 */
-	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
+	for (i = 0; i < tll_channel_count; i++) {
 
 		/* Enable only those channels that are actually used */
 		if (omap->port_mode[i] == OMAP_OHCI_PORT_MODE_UNUSED)
@@ -422,7 +423,7 @@ static int omap3_start_ohci(struct ohci_
 	ohci_omap_writel(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
 	dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
 
-	ohci_omap3_tll_config(omap);
+	ohci_omap3_tll_config(omap, OMAP_TLL_CHANNEL_COUNT);
 
 	return 0;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Munegowda, Keshava]

It is [PATCH 5/5] not [PATCH 5/6].
I have resent this mail with this subject correction.

Regards,
Keshava Munegowda
 
 

> -----Original Message-----
> From: Munegowda, Keshava
> Sent: Wednesday, August 18, 2010 8:26 AM
> To: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: Munegowda, Keshava; Gadiyar, Anand
> Subject: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count
> 
> Make TLL channel count a parameter instead of a hardcoded value.
> This allows us to be flexible with future OMAP revisions which
> could have a different number of channels.
> 
> Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
> Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
> ---
>  drivers/usb/host/ohci-omap3.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> Index: kernel-omap4-base/drivers/usb/host/ohci-omap3.c
> ===================================================================
> --- kernel-omap4-base.orig/drivers/usb/host/ohci-omap3.c
> +++ kernel-omap4-base/drivers/usb/host/ohci-omap3.c
> @@ -245,7 +245,8 @@ static unsigned ohci_omap3_fslsmode(enum
>  	}
>  }
> 
> -static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap)
> +static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap,
> +					u8 tll_channel_count)
>  {
>  	u32 reg;
>  	int i;
> @@ -263,7 +264,7 @@ static void ohci_omap3_tll_config(struct
>  	 * REVISIT: Only the 3-pin and 4-pin PHY modes have
>  	 * actually been tested.
>  	 */
> -	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
> +	for (i = 0; i < tll_channel_count; i++) {
> 
>  		/* Enable only those channels that are actually used */
>  		if (omap->port_mode[i] == OMAP_OHCI_PORT_MODE_UNUSED)
> @@ -422,7 +423,7 @@ static int omap3_start_ohci(struct ohci_
>  	ohci_omap_writel(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
>  	dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
> 
> -	ohci_omap3_tll_config(omap);
> +	ohci_omap3_tll_config(omap, OMAP_TLL_CHANNEL_COUNT);
> 
>  	return 0;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Felipe Balbi]

Hi,

On Wed, Aug 18, 2010 at 04:55:45AM +0200, ext Keshava Munegowda wrote:
>@@ -245,7 +245,8 @@ static unsigned ohci_omap3_fslsmode(enum
> 	}
> }
>
>-static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap)
>+static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap,
>+					u8 tll_channel_count)
> {
> 	u32 reg;
> 	int i;
>@@ -263,7 +264,7 @@ static void ohci_omap3_tll_config(struct
> 	 * REVISIT: Only the 3-pin and 4-pin PHY modes have
> 	 * actually been tested.
> 	 */
>-	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
>+	for (i = 0; i < tll_channel_count; i++) {
>
> 		/* Enable only those channels that are actually used */
> 		if (omap->port_mode[i] == OMAP_OHCI_PORT_MODE_UNUSED)
>@@ -422,7 +423,7 @@ static int omap3_start_ohci(struct ohci_
> 	ohci_omap_writel(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
> 	dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
>
>-	ohci_omap3_tll_config(omap);
>+	ohci_omap3_tll_config(omap, OMAP_TLL_CHANNEL_COUNT);

it's still hardcoded, are you planning to change this in any way ? 
Otherwise I don't see the point for this patch.

-- 
balbi

DefectiveByDesign.org
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Munegowda, Keshava]

 

> -----Original Message-----
> From: Felipe Balbi [mailto:felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org]
> Sent: Thursday, August 19, 2010 11:33 AM
> To: Munegowda, Keshava
> Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Gadiyar, Anand
> Subject: Re: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count
> 
> Hi,
> 
> On Wed, Aug 18, 2010 at 04:55:45AM +0200, ext Keshava Munegowda wrote:
> >@@ -245,7 +245,8 @@ static unsigned ohci_omap3_fslsmode(enum
> > 	}
> > }
> >
> >-static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap)
> >+static void ohci_omap3_tll_config(struct ohci_hcd_omap3 *omap,
> >+					u8 tll_channel_count)
> > {
> > 	u32 reg;
> > 	int i;
> >@@ -263,7 +264,7 @@ static void ohci_omap3_tll_config(struct
> > 	 * REVISIT: Only the 3-pin and 4-pin PHY modes have
> > 	 * actually been tested.
> > 	 */
> >-	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
> >+	for (i = 0; i < tll_channel_count; i++) {
> >
> > 		/* Enable only those channels that are actually used */
> > 		if (omap->port_mode[i] == OMAP_OHCI_PORT_MODE_UNUSED)
> >@@ -422,7 +423,7 @@ static int omap3_start_ohci(struct ohci_
> > 	ohci_omap_writel(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg);
> > 	dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
> >
> >-	ohci_omap3_tll_config(omap);
> >+	ohci_omap3_tll_config(omap, OMAP_TLL_CHANNEL_COUNT);
> 
> it's still hardcoded, are you planning to change this in any way ?
> Otherwise I don't see the point for this patch.
> 
> --
> balbi

The function ohci_omap3_tll_config will be used with different tll channel count in case of OMAP4 support soon, hence this change is required.  We have removed only the hardcoded values used by this function.
Keshava Munegowda 


> DefectiveByDesign.org
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Felipe Balbi]

Hi,

please teach your mailer to break the lines at 80 characters.

On Thu, Aug 19, 2010 at 08:26:06AM +0200, ext Munegowda, Keshava wrote:
>The function ohci_omap3_tll_config will be used with different tll 
>channel count in case of OMAP4 support soon, hence this change is 
>required.  We have removed only the hardcoded values used by this 
>function.

ok then. That's what I expected to hear.

-- 
balbi

DefectiveByDesign.org

RE: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count

[Munegowda, Keshava]

> -----Original Message-----
> From: Felipe Balbi [mailto:felipe.balbi@nokia.com]
> Sent: Thursday, August 19, 2010 12:53 PM
> To: Munegowda, Keshava
> Cc: Balbi Felipe (Nokia-MS/Helsinki); linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; Gadiyar,
> Anand
> Subject: Re: [PATCH 5/6] usb: ohci: don't hard-code TLL channel count
> 
> Hi,
> 
> please teach your mailer to break the lines at 80 characters.
> 
> On Thu, Aug 19, 2010 at 08:26:06AM +0200, ext Munegowda, Keshava wrote:
> >The function ohci_omap3_tll_config will be used with different tll
> >channel count in case of OMAP4 support soon, hence this change is
> >required.  We have removed only the hardcoded values used by this
> >function.
> 
> ok then. That's what I expected to hear.
> 
> --
> balbi
> 
> DefectiveByDesign.org

Thanks balbi, sure I take care this in future.

Keshava Munegowda

Re: [PATCH 3/5] usb: ehci: relocate PHY reset code

[Felipe Balbi]

On Wed, Aug 18, 2010 at 04:55:43AM +0200, ext Keshava Munegowda wrote:
>The PHY reset code is moved at the begining and end of the function
>omap_start_ehc. This simplfies the writing clocks enabling code for
>OMAP4 later.
>
>Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
>Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
>---
> drivers/usb/host/ehci-omap.c |   52 +++++++++++++++++++++----------------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
>Index: linux-2.6/drivers/usb/host/ehci-omap.c
>===================================================================
>--- linux-2.6.orig/drivers/usb/host/ehci-omap.c
>+++ linux-2.6/drivers/usb/host/ehci-omap.c
>@@ -279,6 +279,24 @@ static int omap_start_ehc(struct ehci_hc
>
> 	dev_dbg(omap->dev, "starting TI EHCI USB Controller\n");
>
>+	if (omap->phy_reset) {
>+		/* Refer: ISSUE1 */
>+		if (gpio_is_valid(omap->reset_gpio_port[0])) {
>+			gpio_request(omap->reset_gpio_port[0],
>+						"USB1 PHY reset");
>+			gpio_direction_output(omap->reset_gpio_port[0], 0);
>+		}
>+
>+		if (gpio_is_valid(omap->reset_gpio_port[1])) {
>+			gpio_request(omap->reset_gpio_port[1],
>+						"USB2 PHY reset");
>+			gpio_direction_output(omap->reset_gpio_port[1], 0);
>+		}
>+
>+		/* Hold the PHY in RESET for enough time till DIR is high */
>+		udelay(10);
>+	}

there was another patch doing this with ulpi messages and that's more 
portable as every board will have support for softreset but we can't 
guarantee all of them will have these gpio routed correctly, right ?

-- 
balbi

DefectiveByDesign.org

RE: [PATCH 3/5] usb: ehci: relocate PHY reset code

[Gadiyar, Anand]

Felipe Balbi wrote:
> On Wed, Aug 18, 2010 at 04:55:43AM +0200, ext Keshava Munegowda wrote:
> >The PHY reset code is moved at the begining and end of the function
> >omap_start_ehc. This simplfies the writing clocks enabling code for
> >OMAP4 later.
> >
> >Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
> >Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
> >---
> > drivers/usb/host/ehci-omap.c |   52 +++++++++++++++++++++----------------------
> > 1 file changed, 26 insertions(+), 26 deletions(-)
> >
> >Index: linux-2.6/drivers/usb/host/ehci-omap.c
> >===================================================================
> >--- linux-2.6.orig/drivers/usb/host/ehci-omap.c
> >+++ linux-2.6/drivers/usb/host/ehci-omap.c
> >@@ -279,6 +279,24 @@ static int omap_start_ehc(struct ehci_hc
> >
> > 	dev_dbg(omap->dev, "starting TI EHCI USB Controller\n");
> >
> >+	if (omap->phy_reset) {
> >+		/* Refer: ISSUE1 */
> >+		if (gpio_is_valid(omap->reset_gpio_port[0])) {
> >+			gpio_request(omap->reset_gpio_port[0],
> >+						"USB1 PHY reset");
> >+			gpio_direction_output(omap->reset_gpio_port[0], 0);
> >+		}
> >+
> >+		if (gpio_is_valid(omap->reset_gpio_port[1])) {
> >+			gpio_request(omap->reset_gpio_port[1],
> >+						"USB2 PHY reset");
> >+			gpio_direction_output(omap->reset_gpio_port[1], 0);
> >+		}
> >+
> >+		/* Hold the PHY in RESET for enough time till DIR is high */
> >+		udelay(10);
> >+	}
> 
> there was another patch doing this with ulpi messages and that's more 
> portable as every board will have support for softreset but we can't 
> guarantee all of them will have these gpio routed correctly, right ?

This is just reorganizing existing code - these are for OMAP3 boards, all
of which have been designed with a GPIO to hold the transceiver in reset
until the OMAP is configured for them.

At the point of time at which this code executes, the ULPI link is not up,
and we cannot use ulpi messages to reset the transceivers.


- Anand
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support

[Munegowda, Keshava]

> -----Original Message-----
> From: Munegowda, Keshava
> Sent: Wednesday, August 18, 2010 8:26 AM
> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> Cc: Munegowda, Keshava
> Subject: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support
> 
> This series does minor code cleanup in preparation of an upcoming
> series to add support for EHCI and OHCI on the OMAP4 SoC.
> 
> The changes are:
> - Rename clock names to be consistent across OMAP3 and OMAP4
> - Remove hardcoding of the number of TLL channels
> - Move PHY reset earlier in the init sequence
> 
> These patches do not make any changes to existing functionalities.
> 
> Diffstat is below:
> 
> drivers/usb/host/ehci-omap.c                   |  104 ++++++++++++-------------
> drivers/usb/host/ohci-omap3.c                  |   55 ++++++-------
> 2 files changed
> ---
> Keshava

These are minor patches required for the adding omap4 support for 
EHCI and OHCI in near feature.
Requesting for merge to the current merge window, so that the next 
set of EHCI and OHCI specific changes will be aligned with this patch set.

Keshava Munegowda

Re: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support

[Greg KH]

On Wed, Sep 08, 2010 at 01:21:04PM +0530, Munegowda, Keshava wrote:
> > -----Original Message-----
> > From: Munegowda, Keshava
> > Sent: Wednesday, August 18, 2010 8:26 AM
> > To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> > Cc: Munegowda, Keshava
> > Subject: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support
> > 
> > This series does minor code cleanup in preparation of an upcoming
> > series to add support for EHCI and OHCI on the OMAP4 SoC.
> > 
> > The changes are:
> > - Rename clock names to be consistent across OMAP3 and OMAP4
> > - Remove hardcoding of the number of TLL channels
> > - Move PHY reset earlier in the init sequence
> > 
> > These patches do not make any changes to existing functionalities.
> > 
> > Diffstat is below:
> > 
> > drivers/usb/host/ehci-omap.c                   |  104 ++++++++++++-------------
> > drivers/usb/host/ohci-omap3.c                  |   55 ++++++-------
> > 2 files changed
> > ---
> > Keshava
> 
> These are minor patches required for the adding omap4 support for 
> EHCI and OHCI in near feature.

Do I already have them in my git tree?  Did I forward them to Linus
already?

> Requesting for merge to the current merge window, so that the next 
> set of EHCI and OHCI specific changes will be aligned with this patch set.

What do you mean by "current"?  The merge window for .36 is closed now.
It's bugfixes-only at the moment.  But I can easily queue up stuff for
.37 if you want to resend these.

thanks,

greg k-h

RE: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support

[Munegowda, Keshava]

> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com]
> Sent: Wednesday, September 08, 2010 2:26 PM
> To: Munegowda, Keshava
> Cc: linux-usb-owner@vger.kernel.org; linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; Gadiyar,
> Anand; Kamat, Nishant
> Subject: Re: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support
> 
> On Wed, Sep 08, 2010 at 01:21:04PM +0530, Munegowda, Keshava wrote:
> > > -----Original Message-----
> > > From: Munegowda, Keshava
> > > Sent: Wednesday, August 18, 2010 8:26 AM
> > > To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> > > Cc: Munegowda, Keshava
> > > Subject: [PATCH 0/5] usb: omap: prepare for OMAP4 EHCI and OHCI support
> > >
> > > This series does minor code cleanup in preparation of an upcoming
> > > series to add support for EHCI and OHCI on the OMAP4 SoC.
> > >
> > > The changes are:
> > > - Rename clock names to be consistent across OMAP3 and OMAP4
> > > - Remove hardcoding of the number of TLL channels
> > > - Move PHY reset earlier in the init sequence
> > >
> > > These patches do not make any changes to existing functionalities.
> > >
> > > Diffstat is below:
> > >
> > > drivers/usb/host/ehci-omap.c                   |  104 ++++++++++++-------------
> > > drivers/usb/host/ohci-omap3.c                  |   55 ++++++-------
> > > 2 files changed
> > > ---
> > > Keshava
> >
> > These are minor patches required for the adding omap4 support for
> > EHCI and OHCI in near feature.
> 
> Do I already have them in my git tree?  Did I forward them to Linus
> already?

	No. This series does not exist in your git tree.

> 
> > Requesting for merge to the current merge window, so that the next
> > set of EHCI and OHCI specific changes will be aligned with this patch set.
> 
> What do you mean by "current"?  The merge window for .36 is closed now.
> It's bugfixes-only at the moment.  But I can easily queue up stuff for
> .37 if you want to resend these.
	
	Yes, Will retest these patches on 2.6.36.rc3 kernel and I will resend.

Thanks 
Keshava Munegowda


> 
> thanks,
> 
> greg k-h