diff mbox

phy: cpcap-usb: add MUSB dependency

Message ID 20170609101655.2730560-1-arnd@arndb.de
State Accepted
Commit d05c07c6fadc73fa580d8be1f01cb372c18fd338
Headers show

Commit Message

Arnd Bergmann June 9, 2017, 10:16 a.m. UTC
When MUSB is a loadable module, we get a link error for a built-in
CPCAP driver:

drivers/phy/built-in.o: In function `cpcap_usb_phy_remove':
phy-cpcap-usb.c:(.text+0xed9): undefined reference to `musb_mailbox'

This adds a Kconfig dependency to prevent this broken configuration,
enforcing that CPCAP can only be a module when MUSB is also a module.

Fixes: 68a1f7c9d470 ("phy: cpcap-usb: Add CPCAP PMIC USB support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/phy/motorola/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Sebastian Reichel June 9, 2017, 11:47 a.m. UTC | #1
Hi,

On Fri, Jun 09, 2017 at 12:16:40PM +0200, Arnd Bergmann wrote:
> When MUSB is a loadable module, we get a link error for a built-in

> CPCAP driver:

> 

> drivers/phy/built-in.o: In function `cpcap_usb_phy_remove':

> phy-cpcap-usb.c:(.text+0xed9): undefined reference to `musb_mailbox'

> 

> This adds a Kconfig dependency to prevent this broken configuration,

> enforcing that CPCAP can only be a module when MUSB is also a module.

> 

> Fixes: 68a1f7c9d470 ("phy: cpcap-usb: Add CPCAP PMIC USB support")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>


-- Sebastian

> ---

>  drivers/phy/motorola/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/drivers/phy/motorola/Kconfig b/drivers/phy/motorola/Kconfig

> index 91a46cffd639..6bb7d6bdf1bf 100644

> --- a/drivers/phy/motorola/Kconfig

> +++ b/drivers/phy/motorola/Kconfig

> @@ -4,6 +4,7 @@

>  config PHY_CPCAP_USB

>  	tristate "CPCAP PMIC USB PHY driver"

>  	depends on USB_SUPPORT && IIO

> +	depends on USB_MUSB_HDRC || USB_MUSB_HDRC=n

>  	select GENERIC_PHY

>  	select USB_PHY

>  	help

> -- 

> 2.9.0

>
Kishon Vijay Abraham I June 9, 2017, noon UTC | #2
On Friday 09 June 2017 05:17 PM, Sebastian Reichel wrote:
> Hi,

> 

> On Fri, Jun 09, 2017 at 12:16:40PM +0200, Arnd Bergmann wrote:

>> When MUSB is a loadable module, we get a link error for a built-in

>> CPCAP driver:

>>

>> drivers/phy/built-in.o: In function `cpcap_usb_phy_remove':

>> phy-cpcap-usb.c:(.text+0xed9): undefined reference to `musb_mailbox'

>>

>> This adds a Kconfig dependency to prevent this broken configuration,

>> enforcing that CPCAP can only be a module when MUSB is also a module.

>>

>> Fixes: 68a1f7c9d470 ("phy: cpcap-usb: Add CPCAP PMIC USB support")

>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> 

> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>


merged, thanks!

-Kishon
> 

> -- Sebastian

> 

>> ---

>>  drivers/phy/motorola/Kconfig | 1 +

>>  1 file changed, 1 insertion(+)

>>

>> diff --git a/drivers/phy/motorola/Kconfig b/drivers/phy/motorola/Kconfig

>> index 91a46cffd639..6bb7d6bdf1bf 100644

>> --- a/drivers/phy/motorola/Kconfig

>> +++ b/drivers/phy/motorola/Kconfig

>> @@ -4,6 +4,7 @@

>>  config PHY_CPCAP_USB

>>  	tristate "CPCAP PMIC USB PHY driver"

>>  	depends on USB_SUPPORT && IIO

>> +	depends on USB_MUSB_HDRC || USB_MUSB_HDRC=n

>>  	select GENERIC_PHY

>>  	select USB_PHY

>>  	help

>> -- 

>> 2.9.0

>>
Tony Lindgren June 12, 2017, 8:09 a.m. UTC | #3
* Kishon Vijay Abraham I <kishon@ti.com> [170609 05:04]:
> 

> 

> On Friday 09 June 2017 05:17 PM, Sebastian Reichel wrote:

> > Hi,

> > 

> > On Fri, Jun 09, 2017 at 12:16:40PM +0200, Arnd Bergmann wrote:

> >> When MUSB is a loadable module, we get a link error for a built-in

> >> CPCAP driver:

> >>

> >> drivers/phy/built-in.o: In function `cpcap_usb_phy_remove':

> >> phy-cpcap-usb.c:(.text+0xed9): undefined reference to `musb_mailbox'

> >>

> >> This adds a Kconfig dependency to prevent this broken configuration,

> >> enforcing that CPCAP can only be a module when MUSB is also a module.

> >>

> >> Fixes: 68a1f7c9d470 ("phy: cpcap-usb: Add CPCAP PMIC USB support")

> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > 

> > Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

> 

> merged, thanks!


Yup thanks for fixing it.

Regards,

Tony
diff mbox

Patch

diff --git a/drivers/phy/motorola/Kconfig b/drivers/phy/motorola/Kconfig
index 91a46cffd639..6bb7d6bdf1bf 100644
--- a/drivers/phy/motorola/Kconfig
+++ b/drivers/phy/motorola/Kconfig
@@ -4,6 +4,7 @@ 
 config PHY_CPCAP_USB
 	tristate "CPCAP PMIC USB PHY driver"
 	depends on USB_SUPPORT && IIO
+	depends on USB_MUSB_HDRC || USB_MUSB_HDRC=n
 	select GENERIC_PHY
 	select USB_PHY
 	help