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>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3d9e54062d62fcb2362a626da7682c9eff8b3386..7a39ae86d5ce41a0146201e160c208b697c5e547 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -170,7 +170,6 @@ config USB_EHCI_MSM
        tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
        depends on ARCH_MSM
        select USB_EHCI_ROOT_HUB_TT
-       select USB_MSM_OTG
        ---help---
          Enables support for the USB Host controller present on the
          Qualcomm chipsets. Root Hub has inbuilt TT.

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index fbbced80b68d82d3b4a0c7d16eb3e23b4196fc27..ec531a48d24034aba8a1626ddc0832c58c9a290f 100644 (file)
--- 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