usb: remove CONFIG_USB_MUSB_HOST etc

PATCH In review Constantine Shulyupin 5 participants 8 messages Oct 8, 2012 – Oct 24, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures TI DaVinci machine support

lore

Share & tools

lore

Constantine Shulyupin

author

2012-10-08 13:17 UTC #0 lore raw

PATCH 1/1 usb: remove CONFIG_USB_MUSB_HOST etc

From: Constantine Shulyupin <[email protected]>

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 <[email protected]>

---
 arch/arm/mach-davinci/usb.c |    6 ------
 1 file changed, 6 deletions(-)

arch/arm/mach-davinci/usb.c +0 -6

index f77b953..34509ff 100644
@@ -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,
 };

Signature · 1 line

1.7.9.5

Manjunathappa, Prakash

Acked-by on v1 1/1

2012-10-11 05:42 UTC #1 lore raw

Hi,

Quoted 22 lines · Constantine Shulyupin

From: Constantine Shulyupin <[email protected]>
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 <[email protected]>
---
 arch/arm/mach-davinci/usb.c |    6 ------
 1 file changed, 6 deletions(-)
arch/arm/mach-davinci/usb.c +0 -1
index f77b953..34509ff 100644
@@ -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)

arch/arm/mach-davinci/usb.c static struct musb_hdrc_config musb_config = { · line 49

Quoted 10 lines

arch/arm/mach-davinci/usb.c +0 -5

 	/* 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 <[email protected]>

Thanks,
Prakash

Quoted 8 lines

Signature · 6 lines

1.7.9.5

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source at linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Heiko Schocher

Acked-by

2012-10-11 06:35 UTC #2 lore raw

Hello Manjunathappa

Quoted 38 lines · Prakash

Hi,
Quoted 22 lines · Constantine Shulyupin
From: Constantine Shulyupin<[email protected]>
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<[email protected]>
---
  arch/arm/mach-davinci/usb.c |    6 ------
  1 file changed, 6 deletions(-)
arch/arm/mach-davinci/usb.c +0 -1
index f77b953..34509ff 100644
@@ -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)
arch/arm/mach-davinci/usb.c static struct musb_hdrc_config musb_config = { · line 49
Quoted 10 lines
arch/arm/mach-davinci/usb.c +0 -5
  	/* 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.

Quoted 1 line

Acked-by Manjunathappa, Prakash<[email protected]>

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 <[email protected]>

for this patch.

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Sekhar Nori

2012-10-11 08:50 UTC #3 lore raw

Quoted 41 lines · Heiko Schocher

Hello Manjunathappa
Quoted 38 lines · Prakash
Hi,
Quoted 22 lines · Constantine Shulyupin
From: Constantine Shulyupin<[email protected]>
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<[email protected]>
---
  arch/arm/mach-davinci/usb.c |    6 ------
  1 file changed, 6 deletions(-)
arch/arm/mach-davinci/usb.c +0 -1
index f77b953..34509ff 100644
@@ -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)
arch/arm/mach-davinci/usb.c static struct musb_hdrc_config musb_config = { · line 49
Quoted 10 lines
arch/arm/mach-davinci/usb.c +0 -5
      /* 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.

Quoted 7 lines

Quoted 1 line
Acked-by Manjunathappa, Prakash<[email protected]>
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

author

2012-10-11 10:06 UTC #4 lore raw

I've tested gadget mode on DM365 without HW changes.

Quoted 64 lines · Sekhar Nori

Quoted 41 lines · Heiko Schocher
Hello Manjunathappa
Quoted 38 lines · Prakash
Hi,
Quoted 22 lines · Constantine Shulyupin
From: Constantine Shulyupin<[email protected]>
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<[email protected]>
---
  arch/arm/mach-davinci/usb.c |    6 ------
  1 file changed, 6 deletions(-)
arch/arm/mach-davinci/usb.c +0 -1
index f77b953..34509ff 100644
@@ -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)
arch/arm/mach-davinci/usb.c static struct musb_hdrc_config musb_config = { · line 49
Quoted 10 lines
arch/arm/mach-davinci/usb.c +0 -5
      /* 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.
Quoted 7 lines
Quoted 1 line
Acked-by Manjunathappa, Prakash<[email protected]>
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

Signature · 4 lines

Constantine Shulyupin
http://www.MakeLinux.com/
Embedded Linux Systems,
Device Drivers, TI DaVinci

Sekhar Nori

2012-10-23 12:34 UTC #5 lore raw

In reply to Constantine Shulyupin

Quoted 8 lines · Constantine Shulyupin

From: Constantine Shulyupin <[email protected]>
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 <[email protected]>

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

Quoted 25 lines

 
---
 arch/arm/mach-davinci/usb.c |    6 ------
 1 file changed, 6 deletions(-)

arch/arm/mach-davinci/usb.c +0 -6

index f77b953..34509ff 100644
@@ -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

Acked-by

2012-10-23 12:39 UTC #6 lore raw

Hi,

Quoted 8 lines · Sekhar Nori

Quoted 7 lines · Constantine Shulyupin
From: Constantine Shulyupin <[email protected]>
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.

Quoted 7 lines

Quoted 1 line
Signed-off-by Constantine Shulyupin <[email protected]>
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 <[email protected]>

Quoted 29 lines

Thanks,
Sekhar

Quoted 25 lines

 
---
 arch/arm/mach-davinci/usb.c |    6 ------
 1 file changed, 6 deletions(-)

arch/arm/mach-davinci/usb.c +0 -6

index f77b953..34509ff 100644
@@ -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,
 };

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121023/5395fac4/attachment.sig>

Sekhar Nori

2012-10-24 11:10 UTC #7 lore raw

Quoted 19 lines · Felipe Balbi

Hi,
Quoted 8 lines · Sekhar Nori
Quoted 7 lines · Constantine Shulyupin
From: Constantine Shulyupin <[email protected]>
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.
Quoted 7 lines
Quoted 1 line
Signed-off-by Constantine Shulyupin <[email protected]>
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.

Quoted 3 lines

sorry for the delay, this looks ok:
Acked-by Felipe Balbi <[email protected]>

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