| Message ID | 20200408200828.124139-1-arnd@arndb.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | phy: tegra: fix USB dependencies | expand |
On Wed, Apr 08, 2020 at 10:08:14PM +0200, Arnd Bergmann wrote: > Without CONFIG_USB_SUPPORT, we can get a couple of warnings for > missing dependencies: > > WARNING: unmet direct dependencies detected for USB_PHY > Depends on [n]: USB_SUPPORT [=n] > Selected by [m]: > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > WARNING: unmet direct dependencies detected for USB_CONN_GPIO > Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] > Selected by [m]: > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > Fixes: 6835bdc99580 ("phy: tegra: Select USB_PHY") > Fixes: f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/phy/tegra/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I sent a similar patch a couple of days ago: http://patchwork.ozlabs.org/patch/1263865/ This should be applied by Greg on top of the PR that I sent for USB. I did get the semi-automated "we're in the merge window" reply from Greg, but I was under the impression that he still applied fixes during the merge window. It seems like he didn't pick this up yet, though. Greg, anything I should've done differently for you to notice this? Thierry > diff --git a/drivers/phy/tegra/Kconfig b/drivers/phy/tegra/Kconfig > index a208aca4ba7b..4f8c61863411 100644 > --- a/drivers/phy/tegra/Kconfig > +++ b/drivers/phy/tegra/Kconfig > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > config PHY_TEGRA_XUSB > tristate "NVIDIA Tegra XUSB pad controller driver" > - depends on ARCH_TEGRA > + depends on ARCH_TEGRA && USB_SUPPORT > select USB_CONN_GPIO > select USB_PHY > help > -- > 2.26.0 >
On Thu, Apr 09, 2020 at 03:24:35PM +0200, Thierry Reding wrote: > On Wed, Apr 08, 2020 at 10:08:14PM +0200, Arnd Bergmann wrote: > > Without CONFIG_USB_SUPPORT, we can get a couple of warnings for > > missing dependencies: > > > > WARNING: unmet direct dependencies detected for USB_PHY > > Depends on [n]: USB_SUPPORT [=n] > > Selected by [m]: > > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > > > WARNING: unmet direct dependencies detected for USB_CONN_GPIO > > Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] > > Selected by [m]: > > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > > > Fixes: 6835bdc99580 ("phy: tegra: Select USB_PHY") > > Fixes: f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/phy/tegra/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > I sent a similar patch a couple of days ago: > > http://patchwork.ozlabs.org/patch/1263865/ > > This should be applied by Greg on top of the PR that I sent for USB. I > did get the semi-automated "we're in the merge window" reply from Greg, > but I was under the impression that he still applied fixes during the > merge window. It seems like he didn't pick this up yet, though. > > Greg, anything I should've done differently for you to notice this? I try not to apply anything during the merge window...
On Thu, Apr 9, 2020 at 3:24 PM Thierry Reding <thierry.reding@gmail.com> wrote: > > On Wed, Apr 08, 2020 at 10:08:14PM +0200, Arnd Bergmann wrote: > > Without CONFIG_USB_SUPPORT, we can get a couple of warnings for > > missing dependencies: > > > > WARNING: unmet direct dependencies detected for USB_PHY > > Depends on [n]: USB_SUPPORT [=n] > > Selected by [m]: > > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > > > WARNING: unmet direct dependencies detected for USB_CONN_GPIO > > Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] > > Selected by [m]: > > - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] > > > > Fixes: 6835bdc99580 ("phy: tegra: Select USB_PHY") > > Fixes: f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/phy/tegra/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > I sent a similar patch a couple of days ago: > > http://patchwork.ozlabs.org/patch/1263865/ > > This should be applied by Greg on top of the PR that I sent for USB. I > did get the semi-automated "we're in the merge window" reply from Greg, > but I was under the impression that he still applied fixes during the > merge window. It seems like he didn't pick this up yet, though. > > Greg, anything I should've done differently for you to notice this? FWIW, your patch is correct, mine was wrong as I forgot the "select USB_COMMON". Arnd
diff --git a/drivers/phy/tegra/Kconfig b/drivers/phy/tegra/Kconfig index a208aca4ba7b..4f8c61863411 100644 --- a/drivers/phy/tegra/Kconfig +++ b/drivers/phy/tegra/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config PHY_TEGRA_XUSB tristate "NVIDIA Tegra XUSB pad controller driver" - depends on ARCH_TEGRA + depends on ARCH_TEGRA && USB_SUPPORT select USB_CONN_GPIO select USB_PHY help
Without CONFIG_USB_SUPPORT, we can get a couple of warnings for missing dependencies: WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [m]: - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [m]: - PHY_TEGRA_XUSB [=m] && ARCH_TEGRA [=y] Fixes: 6835bdc99580 ("phy: tegra: Select USB_PHY") Fixes: f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/phy/tegra/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)