summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-13 21:46:52 +0200
committerFelipe Balbi <balbi@ti.com>2014-05-14 09:25:47 -0500
commitc5ab571f81905568a59dce306df0181f33e00932 (patch)
treeba85de9d2e5c8f72f2c6375c20b18915b5adbe9b /drivers/usb/phy
parenta8d191c8bb2f11a8f381e7cb98f978b7288c1401 (diff)
downloadblackbird-op-linux-c5ab571f81905568a59dce306df0181f33e00932.tar.gz
blackbird-op-linux-c5ab571f81905568a59dce306df0181f33e00932.zip
usb: phy: msm: reset controller is mandatory now
Commit a27345434134 "usb: phy: msm: Use reset framework for LINK and PHY resets" introduced a mandatory call to reset_control_get into the msm usb phy driver, which means we have to add a Kconfig dependency on the API to avoid this build error: phy/phy-msm-usb.c: In function 'msm_otg_read_dt': phy/phy-msm-usb.c:1461:2: error: implicit declaration of function 'devm_reset_control_get' [-Werror=implicit-function-declaration] motg->link_rst = devm_reset_control_get(&pdev->dev, "link"); ^ Since the usb-ehci-msm driver currently selects the OTG driver, we could still get a broken dependency here. To solve that, this patch also removes the 'select', which turns out to be unnecessary. Reviewed-by: Ivan T. Ivanov <iivanov@mm-sol.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/phy')
-rw-r--r--drivers/usb/phy/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index fbbced80b68d..ec531a48d240 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -173,6 +173,7 @@ config USB_ISP1301
config USB_MSM_OTG
tristate "Qualcomm on-chip USB OTG controller support"
depends on (USB || USB_GADGET) && (ARCH_MSM || ARCH_QCOM || COMPILE_TEST)
+ depends on RESET_CONTROLLER
select USB_PHY
help
Enable this to support the USB OTG transceiver on Qualcomm chips. It
OpenPOWER on IntegriCloud