From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Tony Lindgren <tony@atomide.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
ivo.g.dimitrov.75@gmail.com, khilman@kernel.org, sre@debian.org,
kernel list <linux-kernel@vger.kernel.org>,
sre@ring0.de, Sakari Ailus <sakari.ailus@iki.fi>,
Pavel Machek <pavel@ucw.cz>,
pali.rohar@gmail.com, linux-omap@vger.kernel.org,
patrikbachan@gmail.com
Subject: [PATCH] usb: musb: fix Kconfig regression
Date: Fri, 27 Feb 2015 21:12:45 +0100 [thread overview]
Message-ID: <7445620.7S2XydQea5@wuerfel> (raw)
In-Reply-To: <20150227153809.GS11056@atomide.com>
A recent bug fix I did that was marked for stable backports
introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.
I was missing the fact that the PHY driver already stubs out the
omap_control_usb_set_mode, and we only need to add a dependency
to prevent the musb-omap2430 driver from being built-in when
the phy driver is a loadable module, but we should not prevent it
from being built altogether when the phy driver is disabled.
This changes the dependency to allow OMAP_CONTROL_PHY to
be disabled, but to disallow USB_MUSB_OMAP2PLUS from being
built-in if OMAP_CONTROL_PHY is a loadable module.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Cc: <stable@vger.kernel.org> # v3.9+
Cc: Felipe Balbi <balbi@ti.com>
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 14e1628483d9..39db8b603627 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010
config USB_MUSB_OMAP2PLUS
tristate "OMAP2430 and onwards"
- depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY
+ depends on ARCH_OMAP2PLUS && USB
+ depends on OMAP_CONTROL_PHY || !OMAP_CONTROL_PHY
select GENERIC_PHY
config USB_MUSB_AM35X
next prev parent reply other threads:[~2015-02-27 20:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-17 18:55 3.20-rc0 breaks nfsroot over usb Pavel Machek
2015-02-26 22:19 ` Pavel Machek
2015-02-26 23:03 ` Aaro Koskinen
2015-02-27 15:38 ` Tony Lindgren
2015-02-27 20:06 ` Arnd Bergmann
2015-02-27 20:12 ` Arnd Bergmann [this message]
2015-02-27 20:21 ` [PATCH] usb: musb: fix Kconfig regression Felipe Balbi
2015-02-27 22:56 ` Pavel Machek
2015-02-27 19:14 ` 3.20-rc0 breaks nfsroot over usb Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7445620.7S2XydQea5@wuerfel \
--to=arnd@arndb.de \
--cc=aaro.koskinen@iki.fi \
--cc=ivo.g.dimitrov.75@gmail.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=patrikbachan@gmail.com \
--cc=pavel@ucw.cz \
--cc=sakari.ailus@iki.fi \
--cc=sre@debian.org \
--cc=sre@ring0.de \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox