From patchwork Tue Feb 20 11:54:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 875505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zlznV69N8z9ryy for ; Tue, 20 Feb 2018 23:04:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876AbeBTL7V (ORCPT ); Tue, 20 Feb 2018 06:59:21 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:40753 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbeBTL7R (ORCPT ); Tue, 20 Feb 2018 06:59:17 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MDPjh-1eyJhH2BPJ-00GpWy; Tue, 20 Feb 2018 12:58:50 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Thierry Reding , Stephen Warren , Thierry Reding , Alexandre Courbot , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org Subject: [4.4-stable 09/22] ARM: tegra: select USB_ULPI from EHCI rather than platform Date: Tue, 20 Feb 2018 12:54:56 +0100 Message-Id: <20180220115527.1806578-10-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:7D0TeIPX5OLqmzyHlX+uwHrVdJL9ssUxR2cptD2mrHgWChlYHIg X/JTqBNWcvWSVoYvzKjv3ZnXvCKQuC/7HUnlEUwJXvwxsiov0l3YbheeR7YZxpOzv2Zs+Nd 9v701RxajRMB+M+kZ5DC2XbNwSfPwK0djWML0/rxEcwApG9vWORoDH1yxHQBCFvK9vGWXXZ d90iX84kuuJYg3f+8Ts4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:ogrXIHjj5U4=:TwSh3iqr323jpMVKD5SrhZ p84EceD6Tx8SnA+l48M4/iscAxFB6SBNNaYVD4z1oAmstTagLNx7KTReIiRQQj/PqUzixCSZj t7aKB96DFGcKn9EQyC7xJbcjU3vKtLx5xFuKtK4X9WaSgrcmmddAKSZitS2voZSvaLz6Su80V NwAoPR14Dby1frZxX8ysqZaBU5vL5/jlCXzWgehzbfAGybeXVCv+sIxfxjVJIg6pnOkAkB78F diT1kmAu0IhYvt2d6QqYqYdwEuR2iRhMkdCYA/si4tnJYHPPKHATmiwZebqbBKFqf8Ki/MYVI p+Cr1oTg6snfjKdh32kI/cYM2QnviKO7cN1Q7xeaQm+hrgrlByJFQYuQgOzMy4JIGxqhpfEJx wD7FesEg64d7KEsHy/aJHDtIlyn9XI3qWkVK+yxjGWixQ7eAAM5m1g5WjNYuTpMt2wqTlFYt3 3aAAxzgz2Lez+5MUTAO5dGmDxLTJRqDWXZlCF7JVdTRrzJ2DXtAG4xmMgrnHIFicV7qtVsvpt bprIrJDWgyIQz3DQpjpPCaNIe/KOdD6ukF80umLtEa96NHze/EdLbS7hIHOB6GWQH0Uqf/7pq Scq8YogZ2EZvgCwdmKk7G1+1wKcYOdBL1GFtwp6eGjrXv3XmugqqVnysAOpoJoS2ykHK8zZeZ MMWXEaeBXWQAcftuRI+m6D1xpu4iN4pUF5uCeD1gagZ/GJJGtmkos74+GrHqZu7BRG3YOXSRo 25mFJz7Sepj64FSs8rUEO3+if2yw3UkJkDkwGA== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org commit a262e87ff354f12447bb6268bd63edf7ba1c20e0 upstream. For historic reasons, the tegra platform selects USB_ULPI from architecture code, but that hasn't really made sense for a long time, as the only user of that code is the Tegra EHCI driver that has its own Kconfig symbol. This removes the 'select' statements from mach-tegra and drivers/soc/tegra and adds them with the device driver that actually needs them. Signed-off-by: Arnd Bergmann Signed-off-by: Thierry Reding [arnd: rebased to 4.4-stable] Signed-off-by: Arnd Bergmann --- arch/arm/mach-tegra/Kconfig | 2 -- arch/arm64/Kconfig.platforms | 2 -- drivers/usb/host/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 0fa4c5f8b1be..2d43357d4a0a 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -12,8 +12,6 @@ menuconfig ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER select SOC_BUS - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help This enables support for NVIDIA Tegra based systems. diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 4043c35962cc..5edb50772c11 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -90,8 +90,6 @@ config ARCH_TEGRA_132_SOC bool "NVIDIA Tegra132 SoC" depends on ARCH_TEGRA select PINCTRL_TEGRA124 - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help Enable support for NVIDIA Tegra132 SoC, based on the Denver ARMv8 CPU. The Tegra132 SoC is similar to the Tegra124 SoC, diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 3bb08870148f..95e72d75e0a0 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -220,6 +220,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.