Skip to content

Commit

Permalink
usb: phy: isp1301: work around tps65010 dependency
Browse files Browse the repository at this point in the history
The isp1301-omap driver contains special hooks for the TPS65010
power management controller. It provides its own 'tps65010_set_vbus_draw'
wrapper in case that driver is not enabled through Kconfig, but
fails to handle the case where isp1301-omap is built-in but TPS65010
is a loadable module, which currently results in a link error:

drivers/built-in.o: In function `isp1301_set_power':
:(.text+0x14e188): undefined reference to `tps65010_set_vbus_draw'

This is a workaround to use the same trick as before also when
tps65010 is a module. Doing a proper fix would require much larger
changes to the driver that is not really worth it when the usb-phy
drivers are going to eventually get replaced with generic-phy
drivers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Arnd Bergmann authored and Felipe Balbi committed Apr 27, 2015
1 parent 3e9d3d2 commit 197d0bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/phy/phy-isp1301-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct isp1301 {

#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3)

#if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE)
#if defined(CONFIG_TPS65010) || (defined(CONFIG_TPS65010_MODULE) && defined(MODULE))

#include <linux/i2c/tps65010.h>

Expand Down

0 comments on commit 197d0bd

Please sign in to comment.