| From 3c28656338f6f5589d15dcfe4e35f47bd1e847e8 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 4 Mar 2019 21:23:57 +0100 |
| Subject: phy: ti: usb2: fix OMAP_CONTROL_PHY dependency |
| |
| [ Upstream commit d41ce98a122c13ea77938af04ef06fb12ae0c69e ] |
| |
| With randconfig build testing on arm64, we can run into a configuration |
| that has CONFIG_OMAP_CONTROL_PHY=m and CONFIG_OMAP_USB2=y, which in turn |
| causes a link failure: |
| |
| drivers/phy/ti/phy-omap-usb2.o: In function `omap_usb_phy_power': |
| phy-omap-usb2.c:(.text+0x17c): undefined reference to `omap_control_phy_power' |
| |
| I could not come up with a good way to correctly describe the relation |
| of the two symbols, but if we just select CONFIG_OMAP_CONTROL_PHY |
| during compile testing, we can no longer run into the broken configuration. |
| |
| Fixes: 6777cee3a872 ("phy: ti: usb2: Add support for AM654 USB2 PHY") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/phy/ti/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/phy/ti/Kconfig b/drivers/phy/ti/Kconfig |
| index 103efc456a12e..022ac16f626cf 100644 |
| --- a/drivers/phy/ti/Kconfig |
| +++ b/drivers/phy/ti/Kconfig |
| @@ -37,7 +37,7 @@ config OMAP_USB2 |
| depends on USB_SUPPORT |
| select GENERIC_PHY |
| select USB_PHY |
| - select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS |
| + select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS || COMPILE_TEST |
| help |
| Enable this to support the transceiver that is part of SOC. This |
| driver takes care of all the PHY functionality apart from comparator. |
| -- |
| 2.20.1 |
| |
