瀏覽代碼

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>
Arnd Bergmann 11 年之前
父節點
當前提交
c5ab571f81
共有 2 個文件被更改,包括 1 次插入1 次删除
  1. 0 1
      drivers/usb/host/Kconfig
  2. 1 0
      drivers/usb/phy/Kconfig

+ 0 - 1
drivers/usb/host/Kconfig

@@ -170,7 +170,6 @@ config USB_EHCI_MSM
 	tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
 	tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
 	depends on ARCH_MSM
 	depends on ARCH_MSM
 	select USB_EHCI_ROOT_HUB_TT
 	select USB_EHCI_ROOT_HUB_TT
-	select USB_MSM_OTG
 	---help---
 	---help---
 	  Enables support for the USB Host controller present on the
 	  Enables support for the USB Host controller present on the
 	  Qualcomm chipsets. Root Hub has inbuilt TT.
 	  Qualcomm chipsets. Root Hub has inbuilt TT.

+ 1 - 0
drivers/usb/phy/Kconfig

@@ -173,6 +173,7 @@ config USB_ISP1301
 config USB_MSM_OTG
 config USB_MSM_OTG
 	tristate "Qualcomm on-chip USB OTG controller support"
 	tristate "Qualcomm on-chip USB OTG controller support"
 	depends on (USB || USB_GADGET) && (ARCH_MSM || ARCH_QCOM || COMPILE_TEST)
 	depends on (USB || USB_GADGET) && (ARCH_MSM || ARCH_QCOM || COMPILE_TEST)
+	depends on RESET_CONTROLLER
 	select USB_PHY
 	select USB_PHY
 	help
 	help
 	  Enable this to support the USB OTG transceiver on Qualcomm chips. It
 	  Enable this to support the USB OTG transceiver on Qualcomm chips. It