From patchwork Fri Aug 13 19:52:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12436019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB9F0C4338F for ; Fri, 13 Aug 2021 19:54:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 898FA610FA for ; Fri, 13 Aug 2021 19:54:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 898FA610FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nXGvKz/y/xPd+7HB4urkPb4+9MhLog9+Hh7ywL8slE4=; b=eqj14o1aC1eNln nadCBPnnNdCap3S6FhTyQhrwfD25+VDd442KHGucqAUbLU2PlUUH8R9/q+CzXnYVH495NZSt6HhEH Zg257Fx6eYrBbRs9lC/h4Ax4VYFvX7XDsdMStIEZ/IOJ6yCyvu/fNg68Btj3e7LDEcg+OVBpcDfTu OChpQsWitMfeyWLc+AGOfWKktA1UNKBZ9DA4FHKGgyJo0VmVz+ax8sOSyc9ylSEhhslsd3+j3Ivxu y9vi42Re99+DEwnobIuoaP291LciW2YTsAMQ3vIUN49LbRrjoQv/QE/l1h0ypF1hNtD5tyI0Qdlbm mG/QPF5HRiYkqTgnxXgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEdEY-00DVNv-Ky; Fri, 13 Aug 2021 19:52:50 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEdEV-00DVMz-35 for linux-arm-kernel@lists.infradead.org; Fri, 13 Aug 2021 19:52:48 +0000 Received: by mail-pj1-x1033.google.com with SMTP id mq2-20020a17090b3802b0290178911d298bso17517991pjb.1 for ; Fri, 13 Aug 2021 12:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p7nbDLVfQ70VzAap47W+E/velrGufmq2Nrz0ruFPQRA=; b=bf/UkzAwyO9u8j3Qj4YzHAdfek0+BFIdzVeUPZRNY2/VQxBbTGD4reSnz3RVnwzGVq 1GLu1adNaQxByDBJvEFVaRyi/puOHKmTBGFAu5j/s4UR2XJXF2/xaBQLrf/STOO67UXo e5/1IDTNMn3VHkyhxKV9spwx7Tv+KWwR4r1jI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p7nbDLVfQ70VzAap47W+E/velrGufmq2Nrz0ruFPQRA=; b=RiXLMIX2GYRU4Z2c/40luatLBqCLBaN/vz9/E1OQBIRjIgMwvGBiBy9JLPKTIwLjJ/ DqPF9DE0GJ7X/Msu0EKhrfs7YmbaKsJdhwK1zbKVQUE5C+stagyplhcOG6X/EADTs+mA ZH8meKKxOJAqcjaTBwqHkRiDB8GUfSRbDGO9LZC6d2473m5I22jL1BDQnhwnSpjC/qco PRo96IERX5viv7830yfWg1Jig+4i8P1Om+tZjQMGs3rDC0sMPZiP9Gdo3QU3Vw/2v8oe bLfk7eVGt567ITws2rSsRqzqao5NVr1rAr4Ds9GTbUZivqYBmvstQXo+DBOfZ/0PxNrF z/DQ== X-Gm-Message-State: AOAM532NsSUMIFAIlBrljV+K+FrGcFXCMDRXAxJKt69twqnyzD5ycon9 IQuD/EAZU6k8YQTtyElP9HXkDA== X-Google-Smtp-Source: ABdhPJy6BBJUXlsE6Y5wt5qaIYD4FIi0ZQdDXV9XbRXGZDlatMa5OD0adSJ0EPqCYPkA28YpbkeMQg== X-Received: by 2002:a63:a54f:: with SMTP id r15mr3746124pgu.212.1628884366441; Fri, 13 Aug 2021 12:52:46 -0700 (PDT) Received: from localhost ([2620:15c:202:201:450d:9788:a70e:42d6]) by smtp.gmail.com with UTF8SMTPSA id n22sm3158768pff.57.2021.08.13.12.52.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Aug 2021 12:52:46 -0700 (PDT) From: Matthias Kaehlcke To: Greg Kroah-Hartman , Alan Stern , Rob Herring , Frank Rowand , Mathias Nyman , Felipe Balbi Cc: devicetree@vger.kernel.org, Peter Chen , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Bastien Nocera , Ravi Chandra Sadineni , Michal Simek , Douglas Anderson , Roger Quadros , Krzysztof Kozlowski , Stephen Boyd , Matthias Kaehlcke , Andrey Zhizhikin , Bjorn Andersson , Catalin Marinas , Dmitry Baryshkov , Enric Balletbo i Serra , Fabio Estevam , =?utf-8?q?Guido_G=C3=BCnther?= , Jagan Teki , Nishanth Menon , Shawn Guo , Vinod Koul , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM Date: Fri, 13 Aug 2021 12:52:25 -0700 Message-Id: <20210813125146.v16.4.Id45138610b749ff775186ac10b3d01c504ddf4f3@changeid> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210813195228.2003500-1-mka@chromium.org> References: <20210813195228.2003500-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210813_125247_171854_844FE49D X-CRM114-Status: GOOD ( 13.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The dependency of USB_DWC3 on USB_XHCI_PLATFORM is being changed from 'select' to 'depends on' by another patch. The defconfig selects USB_DWC3 and implicitly USB_DWC3_DUAL_ROLE, to keep this unchanged USB_XHCI_PLATFORM now needs to be selected explicitly. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson Reviewed-by: Roger Quadros --- Changes in v16: - none Changes in v15: - none Changes in v14: - rebased on v5.14-rc1 (with the rest of the series) - added 'Reviewed-by' tag from Doug Changes in v13: - patch added to the series arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f423d08b9a71..b243bd11a4ed 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -802,6 +802,7 @@ CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=m CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_XHCI_TEGRA=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_EXYNOS=y From patchwork Fri Aug 13 19:52:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12436055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98699C4338F for ; Fri, 13 Aug 2021 19:55:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BC54610CF for ; Fri, 13 Aug 2021 19:55:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5BC54610CF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bG4pWWpjpVFKezeIK41fQfKiq1VTYtQJYGjnaK3pcO4=; b=N6ziwAcmkqbE7r mk+PTLatekQ8S+WIg4w96cI0gjGrxrNKseyeASrwsM7QKHrmbhytbnse0mcT8mlkYF0TMkZnpb9Nb JYct3dY2M215M3h+eB/1yAAEEHKqxQ/yrdB+X8EShPX64Ofz9cMMbreN8ymhqsBuNjyyhY+lsNGoo dl3KryXbbP1ShCMwcPN7qLA44CAt9QhB5K3d0F8iCPJuW1/PQvjBXAYpvB83Xg5dK5gXkKeqX0azx Ye1v354nHG6QlZBpuH2YkME3J3Rs9OAuBgA+3uufLUCsE6HFePFXROTrrEK60Sx4kfrL5PIfmlC6K kMr0XTVMziyvcC3V0Z4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEdEj-00DVQo-Sf; Fri, 13 Aug 2021 19:53:02 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEdEX-00DVNY-Ga for linux-arm-kernel@lists.infradead.org; Fri, 13 Aug 2021 19:52:53 +0000 Received: by mail-pj1-x1033.google.com with SMTP id w13-20020a17090aea0db029017897a5f7bcso17489525pjy.5 for ; Fri, 13 Aug 2021 12:52:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rmecue9QUeQLjEjIx40ol9W8NZeTwwWyqVOpKPEfJgQ=; b=h4+g/p4zliff4K3/cjL/A4A5SmFQmvVCsuFj25M74PywK8belHVLPd84mufDGOc99Y fGqjxwCyRuccst5WNCdAUE7ch+nbURpFjSg5atf2Zf3WWduE4FhEogoZV2doYILpzEL7 xHYipN658PX7IqYoLi7fOn+uDM2MVYnWBKC7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rmecue9QUeQLjEjIx40ol9W8NZeTwwWyqVOpKPEfJgQ=; b=oDCOj6OWYK424gHE4dfD1pDYWE1v4giNPe382ZVWep7jE6/tPQsxhQOY+CtRmWVl9n a1iQwHUG0ZS/NypEQwmT/Z3XSC3wTpeZ95o0woPvyiVvn2/v9GWfqxbXosWUnxDDXjvj 6dqrcuYMnJbRJHF1M8O0cL88zWlMOvXBJXqmbApkHNkrdVJCttnpdDg15Croop58IBrC /MIhH0oClQtSRUvBhhEByDbkVsmRJwRCQXyBbX4z+0ca442WEDG9Do38FvG5YRe+7R5e hbveRa/TIULUp3P8qdHJjCGChtBgwLhTpYZs7NuBzo0etF2aI1u0FyarPitaondBBYaa +B2A== X-Gm-Message-State: AOAM533GO0hrBzhCO24PFwpbLk5DEaq1dGKm3ypFBT5udPpOVK68EA0h qxWVZm/nou/BbteWtSGrqdytpw== X-Google-Smtp-Source: ABdhPJzOWOlsavcCtPw0JA3mrby5b3cV4By0+SKQ6t9340axfGaaw4art/RyEN/KJya669RhN3muMg== X-Received: by 2002:a65:4581:: with SMTP id o1mr3695529pgq.349.1628884369112; Fri, 13 Aug 2021 12:52:49 -0700 (PDT) Received: from localhost ([2620:15c:202:201:450d:9788:a70e:42d6]) by smtp.gmail.com with UTF8SMTPSA id ca7sm2554886pjb.11.2021.08.13.12.52.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Aug 2021 12:52:48 -0700 (PDT) From: Matthias Kaehlcke To: Greg Kroah-Hartman , Alan Stern , Rob Herring , Frank Rowand , Mathias Nyman , Felipe Balbi Cc: devicetree@vger.kernel.org, Peter Chen , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Bastien Nocera , Ravi Chandra Sadineni , Michal Simek , Douglas Anderson , Roger Quadros , Krzysztof Kozlowski , Stephen Boyd , Matthias Kaehlcke , Andrew Lunn , Aswath Govindraju , Dmitry Osipenko , Fabio Estevam , Gregory Clement , Krzysztof Kozlowski , Pawel Laszczak , Sebastian Hesselbarth , Tony Lindgren , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on' Date: Fri, 13 Aug 2021 12:52:26 -0700 Message-Id: <20210813125146.v16.5.If248f05613bbb06a44eb0b0909be5d97218f417b@changeid> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210813195228.2003500-1-mka@chromium.org> References: <20210813195228.2003500-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210813_125249_644428_F0D185BE X-CRM114-Status: GOOD ( 19.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some USB controller drivers that depend on the xhci-plat driver specify this dependency using 'select' in Kconfig. This is not recommended for symbols that have other dependencies as it may lead to invalid configurations. Use 'depends on' to specify the dependency instead of 'select'. For dwc3 specify the dependency on USB_XHCI_PLATFORM in USB_DWC3_HOST and USB_DWC3_DUAL_ROLE. Also adjust the dependencies of USB_DWC3_CORE to make sure that at least one of USB_DWC3_HOST, USB_DWC3_GADGET or USB_DWC3_DUAL_ROLE can be selected. Signed-off-by: Matthias Kaehlcke Reviewed-by: Roger Quadros Reviewed-by: Douglas Anderson --- Changes in v16: - none Changes in v15: - adjusted dependencies of USB_DWC3_CORE to make sure it can only be enabled when at least one of USB_DWC3_HOST, USB_DWC3_GADGET or USB_DWC3_DUAL_ROLE is selectable - updated commit message Changes in v14: - none Changes in v13: - patch added to the series drivers/usb/cdns3/Kconfig | 2 +- drivers/usb/dwc3/Kconfig | 5 +++-- drivers/usb/host/Kconfig | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/usb/cdns3/Kconfig b/drivers/usb/cdns3/Kconfig index b98ca0a1352a..07e12f786d48 100644 --- a/drivers/usb/cdns3/Kconfig +++ b/drivers/usb/cdns3/Kconfig @@ -1,7 +1,7 @@ config USB_CDNS_SUPPORT tristate "Cadence USB Support" depends on USB_SUPPORT && (USB || USB_GADGET) && HAS_DMA - select USB_XHCI_PLATFORM if USB_XHCI_HCD + depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM select USB_ROLE_SWITCH help Say Y here if your system has a Cadence USBSS or USBSSP diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 66b1454c4db2..870f2251350a 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -2,8 +2,7 @@ config USB_DWC3 tristate "DesignWare USB3 DRD Core Support" - depends on (USB || USB_GADGET) && HAS_DMA - select USB_XHCI_PLATFORM if USB_XHCI_HCD + depends on ((USB && USB_XHCI_PLATFORM) || USB_GADGET) && HAS_DMA select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE help Say Y or M here if your system has a Dual Role SuperSpeed @@ -30,6 +29,7 @@ choice config USB_DWC3_HOST bool "Host only mode" depends on USB=y || USB=USB_DWC3 + depends on USB_XHCI_PLATFORM help Select this when you want to use DWC3 in host mode only, thereby the gadget feature will be regressed. @@ -44,6 +44,7 @@ config USB_DWC3_GADGET config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) + depends on USB_XHCI_PLATFORM depends on (EXTCON=y || EXTCON=USB_DWC3) help This is the default mode of working of DWC3 controller where diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index df9428f1dc5e..518c2312ef0c 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -80,7 +80,7 @@ config USB_XHCI_MTK config USB_XHCI_MVEBU tristate "xHCI support for Marvell Armada 375/38x/37xx" - select USB_XHCI_PLATFORM + depends on USB_XHCI_PLATFORM depends on HAS_IOMEM depends on ARCH_MVEBU || COMPILE_TEST help @@ -112,9 +112,9 @@ config USB_EHCI_BRCMSTB config USB_BRCMSTB tristate "Broadcom STB USB support" depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST + depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD select USB_EHCI_BRCMSTB if USB_EHCI_HCD - select USB_XHCI_PLATFORM if USB_XHCI_HCD help Enables support for XHCI, EHCI and OHCI host controllers found in Broadcom STB SoC's.