mfd: omap-usb-host: bug fix for 3.9

mfd: omap-usb-host: bug fix for 3.9

[Roger Quadros]

Hi Samuel,

One of my patch that I sent for 3.9 introduces a bug that fails to
update the port mode hostconfig register. Because of that, the port modes will
always be 0 (i.e. EHCI PHY mode) and other modes will not work. PHY mode will
work, so beagle/panda have no issues.

Since my hardware setup uses only PHY mode, I couldn't catch this problem earlier.

Below is the fix.

>From 82466757a212bd8b54d806c9d56b1acccbd4d464 Mon Sep 17 00:00:00 2001
From: Roger Quadros <rogerq@ti.com>
Date: Wed, 27 Feb 2013 15:19:24 +0200
Subject: [PATCH] mfd: omap-usb-host: Actually update hostconfig

The helper functions omap_usbhs_rev1_hostconfig()
and omap_usbhs_rev2_hostconfig() don't write into
the hostconfig register. Make sure that we write
the return value into the hostconfig register.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/mfd/omap-usb-host.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 6b5edf6..4febc5c 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -460,15 +460,15 @@ static void omap_usbhs_init(struct device *dev)
 
 	switch (omap->usbhs_rev) {
 	case OMAP_USBHS_REV1:
-		omap_usbhs_rev1_hostconfig(omap, reg);
+		reg = omap_usbhs_rev1_hostconfig(omap, reg);
 		break;
 
 	case OMAP_USBHS_REV2:
-		omap_usbhs_rev2_hostconfig(omap, reg);
+		reg = omap_usbhs_rev2_hostconfig(omap, reg);
 		break;
 
 	default:	/* newer revisions */
-		omap_usbhs_rev2_hostconfig(omap, reg);
+		reg = omap_usbhs_rev2_hostconfig(omap, reg);
 		break;
 	}
 
-- 
1.7.4.1

Re: mfd: omap-usb-host: bug fix for 3.9

[Roger Quadros]

Hi Samuel,

On 02/27/2013 04:02 PM, Roger Quadros wrote:
> Hi Samuel,
> 
> One of my patch that I sent for 3.9 introduces a bug that fails to
> update the port mode hostconfig register. Because of that, the port modes will
> always be 0 (i.e. EHCI PHY mode) and other modes will not work. PHY mode will
> work, so beagle/panda have no issues.
> 
> Since my hardware setup uses only PHY mode, I couldn't catch this problem earlier.
> 
> Below is the fix.

Gentle reminder to pick this for 3.9-rc2. Thanks.

cheers,
-roger

> 
>>From 82466757a212bd8b54d806c9d56b1acccbd4d464 Mon Sep 17 00:00:00 2001
> From: Roger Quadros <rogerq@ti.com>
> Date: Wed, 27 Feb 2013 15:19:24 +0200
> Subject: [PATCH] mfd: omap-usb-host: Actually update hostconfig
> 
> The helper functions omap_usbhs_rev1_hostconfig()
> and omap_usbhs_rev2_hostconfig() don't write into
> the hostconfig register. Make sure that we write
> the return value into the hostconfig register.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  drivers/mfd/omap-usb-host.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 6b5edf6..4febc5c 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -460,15 +460,15 @@ static void omap_usbhs_init(struct device *dev)
>  
>  	switch (omap->usbhs_rev) {
>  	case OMAP_USBHS_REV1:
> -		omap_usbhs_rev1_hostconfig(omap, reg);
> +		reg = omap_usbhs_rev1_hostconfig(omap, reg);
>  		break;
>  
>  	case OMAP_USBHS_REV2:
> -		omap_usbhs_rev2_hostconfig(omap, reg);
> +		reg = omap_usbhs_rev2_hostconfig(omap, reg);
>  		break;
>  
>  	default:	/* newer revisions */
> -		omap_usbhs_rev2_hostconfig(omap, reg);
> +		reg = omap_usbhs_rev2_hostconfig(omap, reg);
>  		break;
>  	}
>  
> 

Re: mfd: omap-usb-host: bug fix for 3.9

[Samuel Ortiz]

Hi Roger,

On Wed, Feb 27, 2013 at 04:02:53PM +0200, Roger Quadros wrote:
> Hi Samuel,
> 
> One of my patch that I sent for 3.9 introduces a bug that fails to
> update the port mode hostconfig register. Because of that, the port modes will
> always be 0 (i.e. EHCI PHY mode) and other modes will not work. PHY mode will
> work, so beagle/panda have no issues.
> 
> Since my hardware setup uses only PHY mode, I couldn't catch this problem earlier.
> 
> Below is the fix.
> 
> From 82466757a212bd8b54d806c9d56b1acccbd4d464 Mon Sep 17 00:00:00 2001
> From: Roger Quadros <rogerq@ti.com>
> Date: Wed, 27 Feb 2013 15:19:24 +0200
> Subject: [PATCH] mfd: omap-usb-host: Actually update hostconfig
> 
> The helper functions omap_usbhs_rev1_hostconfig()
> and omap_usbhs_rev2_hostconfig() don't write into
> the hostconfig register. Make sure that we write
> the return value into the hostconfig register.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  drivers/mfd/omap-usb-host.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
Patch applied now, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/