diff mbox

USB-related build errors on Tegra in next-20130319

Message ID 20130320171147.GM1567@arwen.pp.htv.fi
State Not Applicable, archived
Headers show

Commit Message

Felipe Balbi March 20, 2013, 5:11 p.m. UTC 
Hi,

On Wed, Mar 20, 2013 at 10:51:49AM -0600, Stephen Warren wrote:
> On 03/20/2013 10:45 AM, Felipe Balbi wrote:
> > Hi,
> > 
> > On Wed, Mar 20, 2013 at 10:39:11AM -0600, Stephen Warren wrote:
> >> On 03/20/2013 06:20 AM, Felipe Balbi wrote:
> ...
> >> The patch you gave fixes the Kconfig warnings, but not the build
> >> failure.
> ...
> >> For now, I think the correct solution is to have USB_EHCI_TEGRA
> >> select USB_PHY. I validated that solves the build problem, and
> >> has the bonus of not needing any changes to tegra_defconfig.
> ...
> > Alright, do you want to send that patch ? My bad that I missed
> > that build error...
> 
> Sure. Do you want to roll it into your patch and repost it, or me to
> send a separate patch?

updated patch below:

From c2b3334a624e4231952ab050e29445b8c62f662d Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Wed, 20 Mar 2013 14:18:28 +0200
Subject: [PATCH] arm: tegra: fix Kconfig select clauses

USB_ULPI and USB_ULPI_VIEWPORT shouldn't really
be selected directly by anyone, but since Tegra
still needs some time before turning ulpi viewport
into a proper PHY driver, we need to keep the
selects in place.

This patch just fixes the conditional select
so that it will continue to build after merging
the latest PHY layer changes.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-tegra/Kconfig | 8 ++++----
 drivers/usb/host/Kconfig    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Stephen Warren March 20, 2013, 5:26 p.m. UTC | #1 
On 03/20/2013 11:11 AM, Felipe Balbi wrote:
> Hi,
> 
> On Wed, Mar 20, 2013 at 10:51:49AM -0600, Stephen Warren wrote:
>> On 03/20/2013 10:45 AM, Felipe Balbi wrote:
>>> Hi,
>>> 
>>> On Wed, Mar 20, 2013 at 10:39:11AM -0600, Stephen Warren
>>> wrote:
>>>> On 03/20/2013 06:20 AM, Felipe Balbi wrote:
>> ...
>>>> The patch you gave fixes the Kconfig warnings, but not the
>>>> build failure.
>> ...
>>>> For now, I think the correct solution is to have
>>>> USB_EHCI_TEGRA select USB_PHY. I validated that solves the
>>>> build problem, and has the bonus of not needing any changes
>>>> to tegra_defconfig.
>> ...
>>> Alright, do you want to send that patch ? My bad that I missed 
>>> that build error...
>> 
>> Sure. Do you want to roll it into your patch and repost it, or me
>> to send a separate patch?

Oops, sorry, I meant to write "Do you want *me* to" ...

> updated patch below:

Anyway, the updated patch you sent does solve the problem, so:

Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
(both build and ran it on HW to make sure nothing was missing)

Feel free to use yours or the separate one I sent; entirely your call.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi March 20, 2013, 5:30 p.m. UTC | #2 
On Wed, Mar 20, 2013 at 11:26:50AM -0600, Stephen Warren wrote:
> On 03/20/2013 11:11 AM, Felipe Balbi wrote:
> > Hi,
> > 
> > On Wed, Mar 20, 2013 at 10:51:49AM -0600, Stephen Warren wrote:
> >> On 03/20/2013 10:45 AM, Felipe Balbi wrote:
> >>> Hi,
> >>> 
> >>> On Wed, Mar 20, 2013 at 10:39:11AM -0600, Stephen Warren
> >>> wrote:
> >>>> On 03/20/2013 06:20 AM, Felipe Balbi wrote:
> >> ...
> >>>> The patch you gave fixes the Kconfig warnings, but not the
> >>>> build failure.
> >> ...
> >>>> For now, I think the correct solution is to have
> >>>> USB_EHCI_TEGRA select USB_PHY. I validated that solves the
> >>>> build problem, and has the bonus of not needing any changes
> >>>> to tegra_defconfig.
> >> ...
> >>> Alright, do you want to send that patch ? My bad that I missed 
> >>> that build error...
> >> 
> >> Sure. Do you want to roll it into your patch and repost it, or me
> >> to send a separate patch?
> 
> Oops, sorry, I meant to write "Do you want *me* to" ...
> 
> > updated patch below:
> 
> Anyway, the updated patch you sent does solve the problem, so:
> 
> Acked-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
> (both build and ran it on HW to make sure nothing was missing)
> 
> Feel free to use yours or the separate one I sent; entirely your call.

I wonder if the third option isn't nicer ?

select USB_PHY if USB
select USB_ULPI
select USB_ULPI_VIEWPORT

then all changes are in tegra's Kconfig itself ?
Stephen Warren March 20, 2013, 5:42 p.m. UTC | #3 
On 03/20/2013 11:30 AM, Felipe Balbi wrote:
> On Wed, Mar 20, 2013 at 11:26:50AM -0600, Stephen Warren wrote:
>> On 03/20/2013 11:11 AM, Felipe Balbi wrote:
>>> Hi,
>>> 
>>> On Wed, Mar 20, 2013 at 10:51:49AM -0600, Stephen Warren
>>> wrote:
>>>> On 03/20/2013 10:45 AM, Felipe Balbi wrote:
>>>>> Hi,
>>>>> 
>>>>> On Wed, Mar 20, 2013 at 10:39:11AM -0600, Stephen Warren 
>>>>> wrote:
>>>>>> On 03/20/2013 06:20 AM, Felipe Balbi wrote:
>>>> ...
>>>>>> The patch you gave fixes the Kconfig warnings, but not
>>>>>> the build failure.
>>>> ...
>>>>>> For now, I think the correct solution is to have 
>>>>>> USB_EHCI_TEGRA select USB_PHY. I validated that solves
>>>>>> the build problem, and has the bonus of not needing any
>>>>>> changes to tegra_defconfig.
>>>> ...
>>>>> Alright, do you want to send that patch ? My bad that I
>>>>> missed that build error...
>>>> 
>>>> Sure. Do you want to roll it into your patch and repost it,
>>>> or me to send a separate patch?
>> 
>> Oops, sorry, I meant to write "Do you want *me* to" ...
>> 
>>> updated patch below:
>> 
>> Anyway, the updated patch you sent does solve the problem, so:
>> 
>> Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen
>> Warren <swarren@nvidia.com> (both build and ran it on HW to make
>> sure nothing was missing)
>> 
>> Feel free to use yours or the separate one I sent; entirely your
>> call.
> 
> I wonder if the third option isn't nicer ?
> 
> select USB_PHY if USB select USB_ULPI select USB_ULPI_VIEWPORT
> 
> then all changes are in tegra's Kconfig itself ?

I imagine that'd work although I didn't try it. However, I suspect
it's more correct to have USB_EHCI_TEGRA do the select (or later, do a
depend), since that's the option which actually has the dependency.
Otherwise, you're just making USB_EHCI_TEGRA's dependencies work via
selects in some other pretty unrelated node.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi March 20, 2013, 5:56 p.m. UTC | #4 
Hi,

On Wed, Mar 20, 2013 at 11:42:20AM -0600, Stephen Warren wrote:
> On 03/20/2013 11:30 AM, Felipe Balbi wrote:
> > On Wed, Mar 20, 2013 at 11:26:50AM -0600, Stephen Warren wrote:
> >> On 03/20/2013 11:11 AM, Felipe Balbi wrote:
> >>> Hi,
> >>> 
> >>> On Wed, Mar 20, 2013 at 10:51:49AM -0600, Stephen Warren
> >>> wrote:
> >>>> On 03/20/2013 10:45 AM, Felipe Balbi wrote:
> >>>>> Hi,
> >>>>> 
> >>>>> On Wed, Mar 20, 2013 at 10:39:11AM -0600, Stephen Warren 
> >>>>> wrote:
> >>>>>> On 03/20/2013 06:20 AM, Felipe Balbi wrote:
> >>>> ...
> >>>>>> The patch you gave fixes the Kconfig warnings, but not
> >>>>>> the build failure.
> >>>> ...
> >>>>>> For now, I think the correct solution is to have 
> >>>>>> USB_EHCI_TEGRA select USB_PHY. I validated that solves
> >>>>>> the build problem, and has the bonus of not needing any
> >>>>>> changes to tegra_defconfig.
> >>>> ...
> >>>>> Alright, do you want to send that patch ? My bad that I
> >>>>> missed that build error...
> >>>> 
> >>>> Sure. Do you want to roll it into your patch and repost it,
> >>>> or me to send a separate patch?
> >> 
> >> Oops, sorry, I meant to write "Do you want *me* to" ...
> >> 
> >>> updated patch below:
> >> 
> >> Anyway, the updated patch you sent does solve the problem, so:
> >> 
> >> Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen
> >> Warren <swarren@nvidia.com> (both build and ran it on HW to make
> >> sure nothing was missing)
> >> 
> >> Feel free to use yours or the separate one I sent; entirely your
> >> call.
> > 
> > I wonder if the third option isn't nicer ?
> > 
> > select USB_PHY if USB select USB_ULPI select USB_ULPI_VIEWPORT
> > 
> > then all changes are in tegra's Kconfig itself ?
> 
> I imagine that'd work although I didn't try it. However, I suspect
> it's more correct to have USB_EHCI_TEGRA do the select (or later, do a
> depend), since that's the option which actually has the dependency.
> Otherwise, you're just making USB_EHCI_TEGRA's dependencies work via
> selects in some other pretty unrelated node.

alright, let's keep it your way, I'll add your Acked-by and Tested-by
tags and push the patch to my 'next' branch, should show up in
linux-next tomorrow.
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index d1c4893..dbc653e 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -18,8 +18,8 @@  config ARCH_TEGRA_2x_SOC
 	select PL310_ERRATA_727915 if CACHE_L2X0
 	select PL310_ERRATA_769419 if CACHE_L2X0
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
-	select USB_ULPI if USB
-	select USB_ULPI_VIEWPORT if USB_SUPPORT
+	select USB_ULPI if USB_PHY
+	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	  Support for NVIDIA Tegra AP20 and T20 processors, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -37,8 +37,8 @@  config ARCH_TEGRA_3x_SOC
 	select PINCTRL_TEGRA30
 	select PL310_ERRATA_769419 if CACHE_L2X0
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
-	select USB_ULPI if USB
-	select USB_ULPI_VIEWPORT if USB_SUPPORT
+	select USB_ULPI if USB_PHY
+	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	  Support for NVIDIA Tegra T30 processor family, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ba1347c..1b58587 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -179,6 +179,7 @@  config USB_EHCI_TEGRA
        boolean "NVIDIA Tegra HCD support"
        depends on USB_EHCI_HCD && ARCH_TEGRA
        select USB_EHCI_ROOT_HUB_TT
+       select USB_PHY
        help
          This driver enables support for the internal USB Host Controllers
          found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.