ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
Commit193ab2a607
("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. 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:193ab2a607
("usb: gadget: allow multiple gadgets to be built") Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
4513c3b8c4
commit
77c2f02edb
|
@ -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)
|
||||
|
|
|
@ -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) */
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue