From patchwork Fri Oct 4 06:02:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 280472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 743B42C00D1 for ; Fri, 4 Oct 2013 16:02:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298Ab3JDGC4 (ORCPT ); Fri, 4 Oct 2013 02:02:56 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:4067 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288Ab3JDGCz (ORCPT ); Fri, 4 Oct 2013 02:02:55 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Thu, 03 Oct 2013 23:02:53 -0700 Received: from hqemhub03.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Thu, 03 Oct 2013 22:58:57 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Thu, 03 Oct 2013 22:58:57 -0700 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.327.1; Thu, 3 Oct 2013 23:02:54 -0700 Received: from sc-daphne.nvidia.com (Not Verified[172.20.232.60]) by hqnvemgw01.nvidia.com with MailMarshal (v7,1,2,5326) id ; Thu, 03 Oct 2013 23:02:54 -0700 Received: from tamien.nvidia.com (tamien.nvidia.com [172.17.186.57]) by sc-daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id r9462siU013124; Thu, 3 Oct 2013 23:02:54 -0700 (PDT) Date: Thu, 3 Oct 2013 23:02:54 -0700 From: Paul Walmsley X-X-Sender: pwalmsley@tamien To: CC: Subject: [PATCH] USB: host: tegra: CONFIG_USB_EHCI_TEGRA requires ULPI and ULPI viewport support Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Selecting CONFIG_USB_EHCI_TEGRA requires CONFIG_USB_ULPI_VIEWPORT. Otherwise the build can break with: drivers/usb/phy/phy-tegra-usb.c: In function 'ulpi_open': drivers/usb/phy/phy-tegra-usb.c:689:31: error: 'ulpi_viewport_access_ops' undeclared (first use in this function) drivers/usb/phy/phy-tegra-usb.c:689:31: note: each undeclared identifier is reported only once for each function it appears in if CONFIG_USB_ULPI_VIEWPORT is not manually selected. Fix by forcing CONFIG_USB_ULPI_VIEWPORT to be selected when CONFIG_USB_EHCI_TEGRA is selected. Then, since CONFIG_USB_ULPI_VIEWPORT requires CONFIG_USB_ULPI to be selected, add that too. N.B.: ULPI is deprecated on this controller for T114, so it might make sense to split the ULPI support code into a separate file, compiled only if a ULPI PHY is selected. Signed-off-by: Paul Walmsley Cc: --- Observed while building the stable kernels v3.11.[123] with a T114-only Kconfig. drivers/usb/host/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 4263d01..81b9d34 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -202,6 +202,8 @@ config USB_EHCI_TEGRA depends on ARCH_TEGRA select USB_EHCI_ROOT_HUB_TT select USB_PHY + select USB_ULPI + select USB_ULPI_VIEWPORT help This driver enables support for the internal USB Host Controllers found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.