[PATCH 1/2] usb: ehci-omap: fix compilation warning

[PATCH 1/2] usb: ehci-omap: fix compilation warning

[Ajay Kumar Gupta]

Fixes below compilation warning:
drivers/usb/host/ehci-hcd.c:425:
	warning: 'ehci_port_power' defined but not used

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
 drivers/usb/host/ehci-omap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 40a8583..e55fd58 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -659,6 +659,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		goto err_add_hcd;
 	}
 
+	ehci_port_power(omap->ehci, 0);
+
 	return 0;
 
 err_add_hcd:
-- 
1.6.2.4

[PATCH 2/2] usb: ehci-omap: fix Si version related programming

[Ajay Kumar Gupta]

AM3517 is based on ES3.1 thus ES2.x related programming is invalid
for it so updating ES2.x programming.

Also fixed below checkpatch warning:
WARNING: unnecessary whitespace before a quoted newline

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
 drivers/usb/host/ehci-omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index e55fd58..d5ff3e2 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -352,8 +352,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
 		reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
 
 	/* Bypass the TLL module for PHY mode operation */
-	 if (omap_rev() <= OMAP3430_REV_ES2_1) {
-		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n");
+	if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
+		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n");
 		if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
 			(omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
 				(omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))
-- 
1.6.2.4

Re: [PATCH 2/2] usb: ehci-omap: fix Si version related programming

[Felipe Balbi]

On Tue, May 04, 2010 at 01:15:23PM +0530, Ajay Kumar Gupta wrote:
> @@ -352,8 +352,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
>  		reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
>  
>  	/* Bypass the TLL module for PHY mode operation */
> -	 if (omap_rev() <= OMAP3430_REV_ES2_1) {
> -		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n");
> +	if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
> +		dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n");

this shouldn't be here. please pass down a flag through platform_data
for such checks.

-- 
balbi

RE: [PATCH 1/2] usb: ehci-omap: fix compilation warning

[Gupta, Ajay Kumar]

Hi,
> -----Original Message-----
> From: Gupta, Ajay Kumar
> Sent: Tuesday, May 04, 2010 1:15 PM
> To: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org; Gupta, Ajay Kumar
> Subject: [PATCH 1/2] usb: ehci-omap: fix compilation warning
> 
> Fixes below compilation warning:
> drivers/usb/host/ehci-hcd.c:425:
> 	warning: 'ehci_port_power' defined but not used
> 
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
> ---
>  drivers/usb/host/ehci-omap.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 40a8583..e55fd58 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -659,6 +659,8 @@ static int ehci_hcd_omap_probe(struct platform_device
> *pdev)
>  		goto err_add_hcd;
>  	}
> 
> +	ehci_port_power(omap->ehci, 0);

There is a typo error, Port power has to be '1'. I am copying the correct
patch below.

-Ajay
--------------------- cut here --------------------
Subject: [PATCH 1/2 v2] usb: ehci-omap: fix compilation warning

Fixes below compilation warning:
drivers/usb/host/ehci-hcd.c:425:
	warning: 'ehci_port_power' defined but not used

Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-omap.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 40a8583..711332e 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -659,6 +659,9 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		goto err_add_hcd;
 	}
 
+	/* root ports should always stay powered */
+	ehci_port_power(omap->ehci, 1);
+
 	return 0;
 
 err_add_hcd:
-- 
1.6.2.4--------------------- end -------------------------

--
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