diff mbox

phy: omap_usb2: fix module dependency

Message ID 1386707097-25650-1-git-send-email-balbi@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Felipe Balbi Dec. 10, 2013, 8:24 p.m. UTC
Due to over-use of select statements, we could
fall into a situation where CONFIG_USB_PHY would
be enabled while CONFIG_USB_SUPPORT wouldn't.

This would generate a situation where usb_bind_phy()
would not be defined and kernel build for some
OMAP2PLUS platforms would fail.

Fix this by replacing a 'select' with a more proper
'depends on'.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren Dec. 10, 2013, 8:40 p.m. UTC | #1
* Felipe Balbi <balbi@ti.com> [131210 12:26]:
> Due to over-use of select statements, we could
> fall into a situation where CONFIG_USB_PHY would
> be enabled while CONFIG_USB_SUPPORT wouldn't.
> 
> This would generate a situation where usb_bind_phy()
> would not be defined and kernel build for some
> OMAP2PLUS platforms would fail.
> 
> Fix this by replacing a 'select' with a more proper
> 'depends on'.

Do we also need to update omap2plus_defconfig to select
OMAP_CONTROL_USB in this patch?

Regards,

Tony
 
> Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  drivers/phy/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index a344f3d..d8b1a9a 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -24,9 +24,9 @@ config PHY_EXYNOS_MIPI_VIDEO
>  config OMAP_USB2
>  	tristate "OMAP USB2 PHY Driver"
>  	depends on ARCH_OMAP2PLUS
> +	depends on OMAP_CONTROL_USB
>  	select GENERIC_PHY
>  	select USB_PHY
> -	select OMAP_CONTROL_USB
>  	help
>  	  Enable this to support the transceiver that is part of SOC. This
>  	  driver takes care of all the PHY functionality apart from comparator.
> -- 
> 1.8.4.GIT
>
Kishon Vijay Abraham I Dec. 11, 2013, 5:44 a.m. UTC | #2
Hi Felipe,

On Wednesday 11 December 2013 01:54 AM, Felipe Balbi wrote:
> Due to over-use of select statements, we could
> fall into a situation where CONFIG_USB_PHY would
> be enabled while CONFIG_USB_SUPPORT wouldn't.
> 
> This would generate a situation where usb_bind_phy()
> would not be defined and kernel build for some
> OMAP2PLUS platforms would fail.
> 
> Fix this by replacing a 'select' with a more proper
> 'depends on'.

last week I sent a patch changing it to depends on USB_PHY and Greg has merged
it yesterday so it should come in -rc4. Do you think this patch will also be
needed?

Thanks
Kishon

> 
> Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  drivers/phy/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index a344f3d..d8b1a9a 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -24,9 +24,9 @@ config PHY_EXYNOS_MIPI_VIDEO
>  config OMAP_USB2
>  	tristate "OMAP USB2 PHY Driver"
>  	depends on ARCH_OMAP2PLUS
> +	depends on OMAP_CONTROL_USB
>  	select GENERIC_PHY
>  	select USB_PHY
> -	select OMAP_CONTROL_USB
>  	help
>  	  Enable this to support the transceiver that is part of SOC. This
>  	  driver takes care of all the PHY functionality apart from comparator.
>
diff mbox

Patch

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index a344f3d..d8b1a9a 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -24,9 +24,9 @@  config PHY_EXYNOS_MIPI_VIDEO
 config OMAP_USB2
 	tristate "OMAP USB2 PHY Driver"
 	depends on ARCH_OMAP2PLUS
+	depends on OMAP_CONTROL_USB
 	select GENERIC_PHY
 	select USB_PHY
-	select OMAP_CONTROL_USB
 	help
 	  Enable this to support the transceiver that is part of SOC. This
 	  driver takes care of all the PHY functionality apart from comparator.