ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

PATCH Superseded Paul Bolle 3 participants 5 messages May 15, 2014 – May 16, 2014

Subsystems (5)

Arm (32-bit) USB Arm sub-architectures OMAP1 support +1 more subsystems

lore

Share & tools

lore

Paul Bolle

author

2014-05-15 20:55 UTC #0 lore raw

PATCH 1/1 ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

Commit 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built") apparently required that checks for CONFIG_USB_GADGET_OMAP would be replaced with checks for CONFIG_USB_OMAP. Do so now for the remaining checks for CONFIG_USB_GADGET_OMAP, even though these checks have basically been broken since v3.1.

Fixes 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")

Signed-off-by Paul Bolle <[email protected]>

---
Also untested.

It seems efficient to also include the change to phy-isp1301-omap.c in this patch (ie, not ship that as a separate patch).

 arch/arm/mach-omap1/board-h2.c        | 2 +-
 arch/arm/mach-omap1/board-h3.c        | 2 +-
 arch/arm/mach-omap1/board-innovator.c | 2 +-
 arch/arm/mach-omap1/board-osk.c       | 2 +-
 drivers/usb/phy/phy-isp1301-omap.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

arch/arm/mach-omap1/board-h2.c +1 -1

index 65d2acb31498..57092bc7f4f1 100644
@@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,
 
-#ifdef	CONFIG_USB_GADGET_OMAP
+#ifdef	CONFIG_USB_OMAP
 	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */
 	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

arch/arm/mach-omap1/board-h3.c +1 -1

index 816ecd13f81e..c828aacf469a 100644
@@ -366,7 +366,7 @@ static struct omap_usb_config h3_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg	    = 2,
 
-#ifdef CONFIG_USB_GADGET_OMAP
+#ifdef CONFIG_USB_OMAP
 	.hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
 #elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 	/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */

arch/arm/mach-omap1/board-innovator.c +1 -1

index bd5f02e9c354..1652ead0effa 100644
@@ -312,7 +312,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,
 
-#ifdef	CONFIG_USB_GADGET_OMAP
+#ifdef	CONFIG_USB_OMAP
 	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */
 	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

arch/arm/mach-omap1/board-osk.c +1 -1

index 3a0262156e93..70b1b282e5c2 100644
@@ -283,7 +283,7 @@ static struct omap_usb_config osk_usb_config __initdata = {
 	 * be used, with a NONSTANDARD gender-bending cable/dongle, as
 	 * a peripheral.
 	 */
-#ifdef	CONFIG_USB_GADGET_OMAP
+#ifdef	CONFIG_USB_OMAP
 	.register_dev	= 1,
 	.hmc_mode	= 0,
 #else

drivers/usb/phy/phy-isp1301-omap.c +1 -1

index 6e146d723b37..1ea6a0c30040 100644
@@ -1295,7 +1295,7 @@ isp1301_set_host(struct usb_otg *otg, struct usb_bus *host)
 		return isp1301_otg_enable(isp);
 	return 0;
 
-#elif	!defined(CONFIG_USB_GADGET_OMAP)
+#elif	!defined(CONFIG_USB_OMAP)
 	// FIXME update its refcount
 	otg->host = host;

Signature · 1 line

1.9.0

Felipe Balbi

2014-05-15 23:12 UTC #1 lore raw

Quoted 26 lines · Paul Bolle

Commit 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built") apparently required that checks for CONFIG_USB_GADGET_OMAP would be replaced with checks for CONFIG_USB_OMAP. Do so now for the remaining checks for CONFIG_USB_GADGET_OMAP, even though these checks have basically been broken since v3.1.
Fixes 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
Signed-off-by Paul Bolle <[email protected]>
---
Also untested.
It seems efficient to also include the change to phy-isp1301-omap.c in this patch (ie, not ship that as a separate patch).
 arch/arm/mach-omap1/board-h2.c        | 2 +-
 arch/arm/mach-omap1/board-h3.c        | 2 +-
 arch/arm/mach-omap1/board-innovator.c | 2 +-
 arch/arm/mach-omap1/board-osk.c       | 2 +-
 drivers/usb/phy/phy-isp1301-omap.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/board-h2.c +0 -0
index 65d2acb31498..57092bc7f4f1 100644

arch/arm/mach-omap1/board-h2.c static struct omap_usb_config h2_usb_config __initdata = { · line 349

Quoted 5 lines

arch/arm/mach-omap1/board-h2.c +1 -1

@@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,
 
-#ifdef	CONFIG_USB_GADGET_OMAP
+#ifdef	CONFIG_USB_OMAP

CONFIG_USB_OMAP is tristate, it might be better to use IS_ENABLED(CONFIG_USB_OMAP) here. Likewise for the rest of the patch.

Signature · 8 lines

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

Paul Bolle

author

2014-05-16 09:36 UTC #2 lore raw

Felipe,

Quoted 9 lines · Felipe Balbi

Quoted 8 lines · Paul Bolle

arch/arm/mach-omap1/board-h2.c +0 -0

index 65d2acb31498..57092bc7f4f1 100644
@@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,

Quoted 5 lines

arch/arm/mach-omap1/board-h2.c static struct omap_usb_config h2_usb_config __initdata = { · line 349
Quoted 2 lines
arch/arm/mach-omap1/board-h2.c +1 -1
-#ifdef	CONFIG_USB_GADGET_OMAP
+#ifdef	CONFIG_USB_OMAP
CONFIG_USB_OMAP is tristate, it might be better to use IS_ENABLED(CONFIG_USB_OMAP) here. Likewise for the rest of the patch.

Will do shortly. That does increase the scope of the patch, a bit, but since this code has been effectively dead since v3.1 that is hardly an additional risk.

Thanks!

Paul Bolle

author

2014-05-16 10:00 UTC #3 lore raw

PATCH v2 1/1 ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP

And, since we're touching this code, use the IS_ENABLED() macro, so things will now (hopefully) also work if USB_OMAP is modular.

Fixes 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")

Signed-off-by Paul Bolle <[email protected]>

---
v2: us IS_ENABLED() as Felipe requested. Still untested.

 arch/arm/mach-omap1/board-h2.c        | 2 +-
 arch/arm/mach-omap1/board-h3.c        | 2 +-
 arch/arm/mach-omap1/board-innovator.c | 2 +-
 arch/arm/mach-omap1/board-osk.c       | 2 +-
 drivers/usb/phy/phy-isp1301-omap.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

arch/arm/mach-omap1/board-h2.c +1 -1

index 65d2acb31498..5b45d266d83e 100644
@@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,
 
-#ifdef	CONFIG_USB_GADGET_OMAP
+#if IS_ENABLED(CONFIG_USB_OMAP)
 	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */
 	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

arch/arm/mach-omap1/board-h3.c +1 -1

index 816ecd13f81e..bfed4f928663 100644
@@ -366,7 +366,7 @@ static struct omap_usb_config h3_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg	    = 2,
 
-#ifdef CONFIG_USB_GADGET_OMAP
+#if IS_ENABLED(CONFIG_USB_OMAP)
 	.hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
 #elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 	/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */

arch/arm/mach-omap1/board-innovator.c +1 -1

index bd5f02e9c354..c49ce83cc1eb 100644
@@ -312,7 +312,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
 	/* usb1 has a Mini-AB port and external isp1301 transceiver */
 	.otg		= 2,
 
-#ifdef	CONFIG_USB_GADGET_OMAP
+#if IS_ENABLED(CONFIG_USB_OMAP)
 	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */
 	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

arch/arm/mach-omap1/board-osk.c +1 -1

index 3a0262156e93..7436d4cf6596 100644
@@ -283,7 +283,7 @@ static struct omap_usb_config osk_usb_config __initdata = {
 	 * be used, with a NONSTANDARD gender-bending cable/dongle, as
 	 * a peripheral.
 	 */
-#ifdef	CONFIG_USB_GADGET_OMAP
+#if IS_ENABLED(CONFIG_USB_OMAP)
 	.register_dev	= 1,
 	.hmc_mode	= 0,
 #else

drivers/usb/phy/phy-isp1301-omap.c +1 -1

index 6e146d723b37..69e49be8866b 100644
@@ -1295,7 +1295,7 @@ isp1301_set_host(struct usb_otg *otg, struct usb_bus *host)
 		return isp1301_otg_enable(isp);
 	return 0;
 
-#elif	!defined(CONFIG_USB_GADGET_OMAP)
+#elif !IS_ENABLED(CONFIG_USB_OMAP)
 	// FIXME update its refcount
 	otg->host = host;

Signature · 1 line

1.9.0

Tony Lindgren

reviewer

2014-05-16 21:15 UTC #4 lore raw

Quoted 6 lines · Paul Bolle

Commit 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built") apparently required that checks for CONFIG_USB_GADGET_OMAP would be replaced with checks for CONFIG_USB_OMAP. Do so now for the remaining checks for CONFIG_USB_GADGET_OMAP, even though these checks have basically been broken since v3.1.

Quoted 7 lines

And, since we're touching this code, use the IS_ENABLED() macro, so things will now (hopefully) also work if USB_OMAP is modular.
Fixes 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
Signed-off-by Paul Bolle <[email protected]>
---
v2: us IS_ENABLED() as Felipe requested. Still untested.

Thanks applying into omap-for-v3.16/board.

Tony