[PATCH] mach-omap1: Fix call to omap_cfg_reg

[PATCH] mach-omap1: Fix call to omap_cfg_reg

[Nicholas Krause]

This patch fixes the call to ompa_cfg_reg(USB2_SPEED) in the case
that the cpu is a omap16xx and the nwires are not equal to 3.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 arch/arm/mach-omap1/usb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 4118db5..17e3139 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -504,8 +504,7 @@ static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
 		omap_cfg_reg(W9_USB2_TXEN);
 		omap_cfg_reg(W5_USB2_SE0);
 		if (nwires != 3)
-			omap_cfg_reg(Y5_USB2_RCV);
-		// FIXME omap_cfg_reg(USB2_SPEED);
+			omap_cfg_reg(USB2_SPEED)
 	} else {
 		pr_debug("usb%d cpu unrecognized\n", 1);
 		return 0;
-- 
1.9.1

[PATCH] mach-omap1: Fix call to omap_cfg_reg

[Tony Lindgren]

* Nicholas Krause <xerofoify@gmail.com> [140704 10:03]:
> This patch fixes the call to ompa_cfg_reg(USB2_SPEED) in the case
> that the cpu is a omap16xx and the nwires are not equal to 3.

This is most likely unsafe to do as the pin is probably
shared with some other device and we have to rely for
the bootloader to do the right thing for the board.

Regards,

Tony
 
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  arch/arm/mach-omap1/usb.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 4118db5..17e3139 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -504,8 +504,7 @@ static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
>  		omap_cfg_reg(W9_USB2_TXEN);
>  		omap_cfg_reg(W5_USB2_SE0);
>  		if (nwires != 3)
> -			omap_cfg_reg(Y5_USB2_RCV);
> -		// FIXME omap_cfg_reg(USB2_SPEED);
> +			omap_cfg_reg(USB2_SPEED)
>  	} else {
>  		pr_debug("usb%d cpu unrecognized\n", 1);
>  		return 0;
> -- 
> 1.9.1
> 

[PATCH] mach-omap1: Fix call to omap_cfg_reg

[Nick Krause]

Hey Tony,
This seems to be a false positive then.Please reply if it is so I can remove the
Fix me message.
Cheers Nick

On Mon, Jul 7, 2014 at 4:14 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Nicholas Krause <xerofoify@gmail.com> [140704 10:03]:
>> This patch fixes the call to ompa_cfg_reg(USB2_SPEED) in the case
>> that the cpu is a omap16xx and the nwires are not equal to 3.
>
> This is most likely unsafe to do as the pin is probably
> shared with some other device and we have to rely for
> the bootloader to do the right thing for the board.
>
> Regards,
>
> Tony
>
>> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
>> ---
>>  arch/arm/mach-omap1/usb.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
>> index 4118db5..17e3139 100644
>> --- a/arch/arm/mach-omap1/usb.c
>> +++ b/arch/arm/mach-omap1/usb.c
>> @@ -504,8 +504,7 @@ static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
>>               omap_cfg_reg(W9_USB2_TXEN);
>>               omap_cfg_reg(W5_USB2_SE0);
>>               if (nwires != 3)
>> -                     omap_cfg_reg(Y5_USB2_RCV);
>> -             // FIXME omap_cfg_reg(USB2_SPEED);
>> +                     omap_cfg_reg(USB2_SPEED)
>>       } else {
>>               pr_debug("usb%d cpu unrecognized\n", 1);
>>               return 0;
>> --
>> 1.9.1
>>

[PATCH] mach-omap1: Fix call to omap_cfg_reg

[Tony Lindgren]

* Nick Krause <xerofoify@gmail.com> [140707 10:42]:
> Hey Tony,
> This seems to be a false positive then.Please reply if it is so I can remove the
> Fix me message.

Yes, just replace the FIXME with a comment please.

Regards,

Tony