Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit 77c2f02edbeda9409a7cf3fd66233015820c213a

Authored by Paul Bolle
Committed by Tony Lindgren
1 parent 4513c3b8c4
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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.

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 <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/arm/mach-omap1/board-h2.c
Diff comments   View file @ 77c2f02
... ... @@ -346,7 +346,7 @@
346 346 /* usb1 has a Mini-AB port and external isp1301 transceiver */
347 347 .otg = 2,
348 348  
349   -#ifdef CONFIG_USB_GADGET_OMAP
  349 +#if IS_ENABLED(CONFIG_USB_OMAP)
350 350 .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
351 351 /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
352 352 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
arch/arm/mach-omap1/board-h3.c
Diff comments   View file @ 77c2f02
... ... @@ -366,7 +366,7 @@
366 366 /* usb1 has a Mini-AB port and external isp1301 transceiver */
367 367 .otg = 2,
368 368  
369   -#ifdef CONFIG_USB_GADGET_OMAP
  369 +#if IS_ENABLED(CONFIG_USB_OMAP)
370 370 .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
371 371 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
372 372 /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
arch/arm/mach-omap1/board-innovator.c
Diff comments   View file @ 77c2f02
... ... @@ -312,7 +312,7 @@
312 312 /* usb1 has a Mini-AB port and external isp1301 transceiver */
313 313 .otg = 2,
314 314  
315   -#ifdef CONFIG_USB_GADGET_OMAP
  315 +#if IS_ENABLED(CONFIG_USB_OMAP)
316 316 .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
317 317 /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
318 318 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
arch/arm/mach-omap1/board-osk.c
Diff comments   View file @ 77c2f02
... ... @@ -283,7 +283,7 @@
283 283 * be used, with a NONSTANDARD gender-bending cable/dongle, as
284 284 * a peripheral.
285 285 */
286   -#ifdef CONFIG_USB_GADGET_OMAP
  286 +#if IS_ENABLED(CONFIG_USB_OMAP)
287 287 .register_dev = 1,
288 288 .hmc_mode = 0,
289 289 #else
drivers/usb/phy/phy-isp1301-omap.c
Diff comments   View file @ 77c2f02
... ... @@ -1295,7 +1295,7 @@
1295 1295 return isp1301_otg_enable(isp);
1296 1296 return 0;
1297 1297  
1298   -#elif !defined(CONFIG_USB_GADGET_OMAP)
  1298 +#elif !IS_ENABLED(CONFIG_USB_OMAP)
1299 1299 // FIXME update its refcount
1300 1300 otg->host = host;
1301 1301