diff mbox

usb: remove CONFIG_USB_MUSB_HOST etc

Message ID 1349702227-24875-1-git-send-email-const@MakeLinux.com (mailing list archive)
State New, archived
Headers show

Commit Message

Constantine Shulyupin Oct. 8, 2012, 1:17 p.m. UTC
From: Constantine Shulyupin <const@MakeLinux.com>

Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly 
CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST 
and set MUSB_OTG configuration by default
because this configuration options are removed from Kconfig.

Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
 
---
 arch/arm/mach-davinci/usb.c |    6 ------
 1 file changed, 6 deletions(-)

Comments

Manjunathappa, Prakash Oct. 11, 2012, 5:42 a.m. UTC | #1
Hi,
On Mon, Oct 08, 2012 at 18:47:07, Constantine Shulyupin wrote:
> From: Constantine Shulyupin <const@MakeLinux.com>
> 
> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly 
> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST 
> and set MUSB_OTG configuration by default
> because this configuration options are removed from Kconfig.
> 
> Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
>  
> ---
>  arch/arm/mach-davinci/usb.c |    6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index f77b953..34509ff 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
>  };
>  
>  static struct musb_hdrc_platform_data usb_data = {
> -#if defined(CONFIG_USB_MUSB_OTG)
>  	/* OTG requires a Mini-AB connector */
>  	.mode           = MUSB_OTG,
> -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
> -	.mode           = MUSB_PERIPHERAL,
> -#elif defined(CONFIG_USB_MUSB_HOST)
> -	.mode           = MUSB_HOST,
> -#endif
>  	.clock		= "usb",
>  	.config		= &musb_config,
>  };

Tested it on DM6446-EVM for host mode with MSC thumb drive and gadget 
mode with g-ether. It works.

Acked-by: Manjunathappa, Prakash <prakash.pm@ti.com>

Thanks,
Prakash

> -- 
> 1.7.9.5
> 
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
>
Heiko Schocher Oct. 11, 2012, 6:35 a.m. UTC | #2
Hello Manjunathappa

On 11.10.2012 07:42, Manjunathappa, Prakash wrote:
> Hi,
> On Mon, Oct 08, 2012 at 18:47:07, Constantine Shulyupin wrote:
>> From: Constantine Shulyupin<const@MakeLinux.com>
>>
>> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly
>> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST
>> and set MUSB_OTG configuration by default
>> because this configuration options are removed from Kconfig.
>>
>> Signed-off-by: Constantine Shulyupin<const@MakeLinux.com>
>>
>> ---
>>   arch/arm/mach-davinci/usb.c |    6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
>> index f77b953..34509ff 100644
>> --- a/arch/arm/mach-davinci/usb.c
>> +++ b/arch/arm/mach-davinci/usb.c
>> @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
>>   };
>>
>>   static struct musb_hdrc_platform_data usb_data = {
>> -#if defined(CONFIG_USB_MUSB_OTG)
>>   	/* OTG requires a Mini-AB connector */
>>   	.mode           = MUSB_OTG,
>> -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
>> -	.mode           = MUSB_PERIPHERAL,
>> -#elif defined(CONFIG_USB_MUSB_HOST)
>> -	.mode           = MUSB_HOST,
>> -#endif
>>   	.clock		= "usb",
>>   	.config		=&musb_config,
>>   };
>
> Tested it on DM6446-EVM for host mode with MSC thumb drive and gadget
> mode with g-ether. It works.
>
> Acked-by: Manjunathappa, Prakash<prakash.pm@ti.com>

I sent a similiar patch here:

http://comments.gmane.org/gmane.linux.usb.general/54512

If the issues, mentioned from Sergei for my patch, nullified I add my:

Acked-by: Heiko Schocher <hs@denx.de>

for this patch.

bye,
Heiko
Sekhar Nori Oct. 11, 2012, 8:50 a.m. UTC | #3
On 10/11/2012 12:05 PM, Heiko Schocher wrote:
> Hello Manjunathappa
> 
> On 11.10.2012 07:42, Manjunathappa, Prakash wrote:
>> Hi,
>> On Mon, Oct 08, 2012 at 18:47:07, Constantine Shulyupin wrote:
>>> From: Constantine Shulyupin<const@MakeLinux.com>
>>>
>>> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly
>>> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST
>>> and set MUSB_OTG configuration by default
>>> because this configuration options are removed from Kconfig.
>>>
>>> Signed-off-by: Constantine Shulyupin<const@MakeLinux.com>
>>>
>>> ---
>>>   arch/arm/mach-davinci/usb.c |    6 ------
>>>   1 file changed, 6 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
>>> index f77b953..34509ff 100644
>>> --- a/arch/arm/mach-davinci/usb.c
>>> +++ b/arch/arm/mach-davinci/usb.c
>>> @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
>>>   };
>>>
>>>   static struct musb_hdrc_platform_data usb_data = {
>>> -#if defined(CONFIG_USB_MUSB_OTG)
>>>       /* OTG requires a Mini-AB connector */
>>>       .mode           = MUSB_OTG,
>>> -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
>>> -    .mode           = MUSB_PERIPHERAL,
>>> -#elif defined(CONFIG_USB_MUSB_HOST)
>>> -    .mode           = MUSB_HOST,
>>> -#endif
>>>       .clock        = "usb",
>>>       .config        =&musb_config,
>>>   };
>>
>> Tested it on DM6446-EVM for host mode with MSC thumb drive and gadget
>> mode with g-ether. It works.
>>
>> Acked-by: Manjunathappa, Prakash<prakash.pm@ti.com>
> 
> I sent a similiar patch here:
> 
> http://comments.gmane.org/gmane.linux.usb.general/54512
> 
> If the issues, mentioned from Sergei for my patch, nullified I add my:

The last outstanding issue from Sergei seems to be additional comments
describing why MUSB_OTG is OK to use.

Prakash/Constantine,

Did you have to make any hardware changes when testing host/gadget on
DM6446 EVM? Or change in kernel configuration?

It appears that there is no way to choose any of the config option
affecting the mode setting. Right now it seems to be just defaulting to
MUSB_UNDEFINED. Setting it to MUSB_OTG would be better than that.

Thanks,
Sekhar
Constantine Shulyupin Oct. 11, 2012, 10:06 a.m. UTC | #4
I've tested gadget mode on DM365 without HW changes.

On Thu, Oct 11, 2012 at 10:50 AM, Sekhar Nori <nsekhar@ti.com> wrote:
> On 10/11/2012 12:05 PM, Heiko Schocher wrote:
>> Hello Manjunathappa
>>
>> On 11.10.2012 07:42, Manjunathappa, Prakash wrote:
>>> Hi,
>>> On Mon, Oct 08, 2012 at 18:47:07, Constantine Shulyupin wrote:
>>>> From: Constantine Shulyupin<const@MakeLinux.com>
>>>>
>>>> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly
>>>> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST
>>>> and set MUSB_OTG configuration by default
>>>> because this configuration options are removed from Kconfig.
>>>>
>>>> Signed-off-by: Constantine Shulyupin<const@MakeLinux.com>
>>>>
>>>> ---
>>>>   arch/arm/mach-davinci/usb.c |    6 ------
>>>>   1 file changed, 6 deletions(-)
>>>>
>>>> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
>>>> index f77b953..34509ff 100644
>>>> --- a/arch/arm/mach-davinci/usb.c
>>>> +++ b/arch/arm/mach-davinci/usb.c
>>>> @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
>>>>   };
>>>>
>>>>   static struct musb_hdrc_platform_data usb_data = {
>>>> -#if defined(CONFIG_USB_MUSB_OTG)
>>>>       /* OTG requires a Mini-AB connector */
>>>>       .mode           = MUSB_OTG,
>>>> -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
>>>> -    .mode           = MUSB_PERIPHERAL,
>>>> -#elif defined(CONFIG_USB_MUSB_HOST)
>>>> -    .mode           = MUSB_HOST,
>>>> -#endif
>>>>       .clock        = "usb",
>>>>       .config        =&musb_config,
>>>>   };
>>>
>>> Tested it on DM6446-EVM for host mode with MSC thumb drive and gadget
>>> mode with g-ether. It works.
>>>
>>> Acked-by: Manjunathappa, Prakash<prakash.pm@ti.com>
>>
>> I sent a similiar patch here:
>>
>> http://comments.gmane.org/gmane.linux.usb.general/54512
>>
>> If the issues, mentioned from Sergei for my patch, nullified I add my:
>
> The last outstanding issue from Sergei seems to be additional comments
> describing why MUSB_OTG is OK to use.
>
> Prakash/Constantine,
>
> Did you have to make any hardware changes when testing host/gadget on
> DM6446 EVM? Or change in kernel configuration?
>
> It appears that there is no way to choose any of the config option
> affecting the mode setting. Right now it seems to be just defaulting to
> MUSB_UNDEFINED. Setting it to MUSB_OTG would be better than that.
>
> Thanks,
> Sekhar
Sekhar Nori Oct. 23, 2012, 12:34 p.m. UTC | #5
On 10/8/2012 6:47 PM, Constantine Shulyupin wrote:
> From: Constantine Shulyupin <const@MakeLinux.com>
> 
> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly 
> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST 
> and set MUSB_OTG configuration by default
> because this configuration options are removed from Kconfig.
> 
> Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>

Queuing this patch for v3.8. Since the config options are removed there
is no use having code which refers to them. The patch has been tested on
DM644x and DM365 in both host and gadget mode (I will add this
information to commit text while committing). Without this patch .mode
seems to be defaulting to MUSB_UNDEFINED which I think is definitely wrong.

Thanks,
Sekhar

>  
> ---
>  arch/arm/mach-davinci/usb.c |    6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index f77b953..34509ff 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
>  };
>  
>  static struct musb_hdrc_platform_data usb_data = {
> -#if defined(CONFIG_USB_MUSB_OTG)
>  	/* OTG requires a Mini-AB connector */
>  	.mode           = MUSB_OTG,
> -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
> -	.mode           = MUSB_PERIPHERAL,
> -#elif defined(CONFIG_USB_MUSB_HOST)
> -	.mode           = MUSB_HOST,
> -#endif
>  	.clock		= "usb",
>  	.config		= &musb_config,
>  };
>
Felipe Balbi Oct. 23, 2012, 12:39 p.m. UTC | #6
Hi,

On Tue, Oct 23, 2012 at 06:04:53PM +0530, Sekhar Nori wrote:
> On 10/8/2012 6:47 PM, Constantine Shulyupin wrote:
> > From: Constantine Shulyupin <const@MakeLinux.com>
> > 
> > Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly 
> > CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST 
> > and set MUSB_OTG configuration by default
> > because this configuration options are removed from Kconfig.
> > 
> > Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
> 
> Queuing this patch for v3.8. Since the config options are removed there
> is no use having code which refers to them. The patch has been tested on
> DM644x and DM365 in both host and gadget mode (I will add this
> information to commit text while committing). Without this patch .mode
> seems to be defaulting to MUSB_UNDEFINED which I think is definitely wrong.

sorry for the delay, this looks ok:

Acked-by: Felipe Balbi <balbi@ti.com>

> 
> Thanks,
> Sekhar
> 
> >  
> > ---
> >  arch/arm/mach-davinci/usb.c |    6 ------
> >  1 file changed, 6 deletions(-)
> > 
> > diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> > index f77b953..34509ff 100644
> > --- a/arch/arm/mach-davinci/usb.c
> > +++ b/arch/arm/mach-davinci/usb.c
> > @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
> >  };
> >  
> >  static struct musb_hdrc_platform_data usb_data = {
> > -#if defined(CONFIG_USB_MUSB_OTG)
> >  	/* OTG requires a Mini-AB connector */
> >  	.mode           = MUSB_OTG,
> > -#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
> > -	.mode           = MUSB_PERIPHERAL,
> > -#elif defined(CONFIG_USB_MUSB_HOST)
> > -	.mode           = MUSB_HOST,
> > -#endif
> >  	.clock		= "usb",
> >  	.config		= &musb_config,
> >  };
> >
Sekhar Nori Oct. 24, 2012, 11:10 a.m. UTC | #7
On 10/23/2012 6:09 PM, Felipe Balbi wrote:
> Hi,
> 
> On Tue, Oct 23, 2012 at 06:04:53PM +0530, Sekhar Nori wrote:
>> On 10/8/2012 6:47 PM, Constantine Shulyupin wrote:
>>> From: Constantine Shulyupin <const@MakeLinux.com>
>>>
>>> Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly 
>>> CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST 
>>> and set MUSB_OTG configuration by default
>>> because this configuration options are removed from Kconfig.
>>>
>>> Signed-off-by: Constantine Shulyupin <const@MakeLinux.com>
>>
>> Queuing this patch for v3.8. Since the config options are removed there
>> is no use having code which refers to them. The patch has been tested on
>> DM644x and DM365 in both host and gadget mode (I will add this
>> information to commit text while committing). Without this patch .mode
>> seems to be defaulting to MUSB_UNDEFINED which I think is definitely wrong.
> 
> sorry for the delay, this looks ok:
> 
> Acked-by: Felipe Balbi <balbi@ti.com>

Thanks Felipe, I added your ack.

Constantine,

Patches touching arch/arm/* should be prefixed with 'ARM:' and those
touching mach-davinci should be prefixed with 'davinci:'. I added these
two while committing the patch this time. Please take care next time on.

Thanks,
Sekhar
diff mbox

Patch

diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index f77b953..34509ff 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -42,14 +42,8 @@  static struct musb_hdrc_config musb_config = {
 };
 
 static struct musb_hdrc_platform_data usb_data = {
-#if defined(CONFIG_USB_MUSB_OTG)
 	/* OTG requires a Mini-AB connector */
 	.mode           = MUSB_OTG,
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
-	.mode           = MUSB_PERIPHERAL,
-#elif defined(CONFIG_USB_MUSB_HOST)
-	.mode           = MUSB_HOST,
-#endif
 	.clock		= "usb",
 	.config		= &musb_config,
 };