| Message ID | 1427831308-1854-57-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Mar 31, 2015 at 12:47:01PM -0700, Kamal Mostafa wrote: > 3.13.11-ckt18 -stable review patch. If anyone has any objections, please let me know. > Arnd reported a regression caused by this patch. It seems to be fixed by commit 1c390eb360c3 ("usb: musb: fix Kconfig regression"), also tagged for stable. However, it looks like this patch was actually dropped from all the stable trees as Arnd also pointed out that the original problem was relatively harmless. Cheers, -- Luís > ------------------ > > From: Arnd Bergmann <arnd@arndb.de> > > commit fbba7db3990cb707ff91cd6507d53a0a730afe97 upstream. > > The omap musb front-end calls into the phy driver directly > instead of using a generic phy interface, which causes a link > error when the specific driver is not built-in: > > drivers/built-in.o: In function `omap2430_musb_disable': > usb/musb/omap2430.c:480: undefined reference to `omap_control_usb_set_mode' > drivers/built-in.o: In function `omap2430_musb_enable': > usb/musb/omap2430.c:466: undefined reference to `omap_control_usb_set_mode' > usb/musb/omap2430.c:447: undefined reference to `omap_control_usb_set_mode' > drivers/built-in.o: In function `omap_musb_set_mailbox': > usb/musb/omap2430.c:273: undefined reference to `omap_control_usb_set_mode' > usb/musb/omap2430.c:304: undefined reference to `omap_control_usb_set_mode' > drivers/built-in.o:(.debug_addr+0xbd9e0): more undefined references to `omap_control_usb_set_mode' follow > > This adds an explicit dependency. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: ca784be36cc725 ("usb: start using the control module driver") > Signed-off-by: Felipe Balbi <balbi@ti.com> > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > drivers/usb/musb/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > index a70f46f..ddcbcdd 100644 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -74,7 +74,7 @@ config USB_MUSB_TUSB6010 > > config USB_MUSB_OMAP2PLUS > tristate "OMAP2430 and onwards" > - depends on ARCH_OMAP2PLUS && USB > + depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY > select GENERIC_PHY > > config USB_MUSB_AM35X > -- > 1.9.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On Wed, 2015-04-01 at 10:37 +0100, Luis Henriques wrote: > On Tue, Mar 31, 2015 at 12:47:01PM -0700, Kamal Mostafa wrote: > > 3.13.11-ckt18 -stable review patch. If anyone has any objections, please let me know. > > > > Arnd reported a regression caused by this patch. It seems to be fixed > by commit 1c390eb360c3 ("usb: musb: fix Kconfig regression"), also > tagged for stable. However, it looks like this patch was actually > dropped from all the stable trees as Arnd also pointed out that the > original problem was relatively harmless. Ok, I'll drop it from 3.13-stable as well then. Thanks Luis and Arnd. -Kamal > Cheers, > -- > Luís > > > ------------------ > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > commit fbba7db3990cb707ff91cd6507d53a0a730afe97 upstream. > > > > The omap musb front-end calls into the phy driver directly > > instead of using a generic phy interface, which causes a link > > error when the specific driver is not built-in: > > > > drivers/built-in.o: In function `omap2430_musb_disable': > > usb/musb/omap2430.c:480: undefined reference to `omap_control_usb_set_mode' > > drivers/built-in.o: In function `omap2430_musb_enable': > > usb/musb/omap2430.c:466: undefined reference to `omap_control_usb_set_mode' > > usb/musb/omap2430.c:447: undefined reference to `omap_control_usb_set_mode' > > drivers/built-in.o: In function `omap_musb_set_mailbox': > > usb/musb/omap2430.c:273: undefined reference to `omap_control_usb_set_mode' > > usb/musb/omap2430.c:304: undefined reference to `omap_control_usb_set_mode' > > drivers/built-in.o:(.debug_addr+0xbd9e0): more undefined references to `omap_control_usb_set_mode' follow > > > > This adds an explicit dependency. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Fixes: ca784be36cc725 ("usb: start using the control module driver") > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > > --- > > drivers/usb/musb/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > > index a70f46f..ddcbcdd 100644 > > --- a/drivers/usb/musb/Kconfig > > +++ b/drivers/usb/musb/Kconfig > > @@ -74,7 +74,7 @@ config USB_MUSB_TUSB6010 > > > > config USB_MUSB_OMAP2PLUS > > tristate "OMAP2430 and onwards" > > - depends on ARCH_OMAP2PLUS && USB > > + depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY > > select GENERIC_PHY > > > > config USB_MUSB_AM35X > > -- > > 1.9.1 > > > > > > -- > > kernel-team mailing list > > kernel-team@lists.ubuntu.com > > https://lists.ubuntu.com/mailman/listinfo/kernel-team > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index a70f46f..ddcbcdd 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -74,7 +74,7 @@ config USB_MUSB_TUSB6010 config USB_MUSB_OMAP2PLUS tristate "OMAP2430 and onwards" - depends on ARCH_OMAP2PLUS && USB + depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY select GENERIC_PHY config USB_MUSB_AM35X