Skip to content

Commit

Permalink
usb: phy: make it a menuconfig
Browse files Browse the repository at this point in the history
We already have a considerable amount of USB
PHY drivers, making it a menuconfig just
prevents us from adding too much churn to
USB's menuconfig.

While at that, also select USB_OTG_UTILS from
this new menuconfig just to keep backwards
compatibility until we manage to remove
that symbol.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent a0e6312 commit edc7cb2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_UWB) += uwb/
obj-$(CONFIG_USB_OTG_UTILS) += usb/
obj-$(CONFIG_USB_PHY) += usb/
obj-$(CONFIG_USB) += usb/
obj-$(CONFIG_PCI) += usb/
obj-$(CONFIG_USB_GADGET) += usb/
Expand Down
17 changes: 12 additions & 5 deletions drivers/usb/phy/Kconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
#
# Physical Layer USB driver configuration
#
comment "USB Physical Layer drivers"
depends on USB || USB_GADGET
menuconfig USB_PHY
tristate "USB Physical Layer drivers"
select USB_OTG_UTILS
help
USB controllers (those which are host, device or DRD) need a
device to handle the physical layer signalling, commonly called
a PHY.

The following drivers add support for such PHY devices.

if USB_PHY

config USB_OTG_UTILS
bool
help
Select this to make sure the build includes objects from
the OTG infrastructure directory.

if USB || USB_GADGET

#
# USB Transceiver Drivers
#
Expand Down Expand Up @@ -206,4 +213,4 @@ config USB_ULPI_VIEWPORT
Provides read/write operations to the ULPI phy register set for
controllers with a viewport register (e.g. Chipidea/ARC controllers).

endif # USB || OTG
endif # USB_PHY
2 changes: 1 addition & 1 deletion drivers/usb/phy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG

obj-$(CONFIG_USB_OTG_UTILS) += phy.o
obj-$(CONFIG_USB_PHY) += phy.o

# transceiver drivers, keep the list sorted

Expand Down
2 changes: 1 addition & 1 deletion include/linux/usb/phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ usb_phy_shutdown(struct usb_phy *x)
}

/* for usb host and peripheral controller drivers */
#ifdef CONFIG_USB_OTG_UTILS
#if IS_ENABLED(CONFIG_USB_PHY)
extern struct usb_phy *usb_get_phy(enum usb_phy_type type);
extern struct usb_phy *devm_usb_get_phy(struct device *dev,
enum usb_phy_type type);
Expand Down

0 comments on commit edc7cb2

Please sign in to comment.