From patchwork Thu Aug 18 13:57:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12947203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 05E2CC00140 for ; Thu, 18 Aug 2022 14:21:04 +0000 (UTC) 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=HcJofsBXR2MQm+zjGJmYngU1jYinNQsJjiTV5+9jNvQ=; b=f6InW7/aUIH+9Y 4Ves6W46xIRiHlwwU2UaYALtbGmSGOKdteL+NtM2f586nl0d5jQeBbmeBEokD1dgkngoaUeOzphLy joxURaB2kXpvJYBGAqAUSKUtRQ1A6OM9quNoxOX4CqggDIl6UwMbRWX7hWZRk7LOGhUEwSba3QR7K lvV6scwBeDxEnjvhsYmpHVgR3coNd9L8vASDsnfc+CLieL0rxtxdZtYjfDv89KmNebdRIuwuSTLIz PN08SD99q+fCDebRHsFjm2qJpK8RrMQAEaGxMcyn71M8Uhpf/CnRYNuHun6XSzekdIc7cKJ//2ohg a2GIJjVokgY9NadgCi3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOgNC-005yNe-9o; Thu, 18 Aug 2022 14:19:51 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOg40-005nk4-6t for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 14:00:01 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BB8EF616D6; Thu, 18 Aug 2022 13:59:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC1BCC433C1; Thu, 18 Aug 2022 13:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660831199; bh=GXZIItypEHjQWFs8f6Waz69s/m0DTcToAM/9CwRqUN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RVXozCtzXhgUvTEJmptj3ciD8Y3SvvJPtLtFjqJrlWq+NEDwuaNBfuLEayPrc42CN yyCJibjvmPhDzJ05Jun4jCorRHUE3+mhdzJD2z1p4ZLQAKM6w2EaUwumVBoAAD370q 6PI5Hgal/UJZIvctJuuhDH2p7c7Kun3gkrdewZX9ZSsgK76a/lfPbL6s4JuPB5OlVT Rh0OdOHBBo2jLas0MLN5j37p61NXafVpYLQ+Xf2F7qBv44m/lQMX9z34hHfIripXPq WdbHZySdEhh5IijqL8mGmd5mLoGmqFlIwCumbIJwGUE40qIH5bkpfbJY8pDG/WcIr1 TYK5uVG5htO2g== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Bin Liu , Greg Kroah-Hartman , Arnd Bergmann , Stefan Wahren , Felipe Balbi , Tony Lindgren Cc: Randy Dunlap , Conor Dooley , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] musb: fix USB_MUSB_TUSB6010 dependency Date: Thu, 18 Aug 2022 15:57:20 +0200 Message-Id: <20220818135737.3143895-10-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220818135737.3143895-1-arnd@kernel.org> References: <20220818135522.3143514-1-arnd@kernel.org> <20220818135737.3143895-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_070000_395216_8B81FC30 X-CRM114-Status: GOOD ( 16.00 ) 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 From: Arnd Bergmann Turning on NOP_USB_XCEIV as builtin broke the TUSB6010 driver because of an older issue with the depencency. It is not necessary to forbid NOP_USB_XCEIV=y in combination with USB_MUSB_HDRC=m, but only the reverse, which causes the link failure from the original Kconfig change. Use the correct dependency to still allow NOP_USB_XCEIV=n or NOP_USB_XCEIV=y but forbid NOP_USB_XCEIV=m when USB_MUSB_HDRC=m to fix the multi_v7_defconfig for tusb. Fixes: ab37a7a890c1 ("ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in") Fixes: c0442479652b ("usb: musb: Fix randconfig build issues for Kconfig options") Signed-off-by: Arnd Bergmann Reviewed-by: Greg Kroah-Hartman --- drivers/usb/musb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index f906dfd360d3..6c8f7763e75e 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -86,7 +86,7 @@ config USB_MUSB_TUSB6010 tristate "TUSB6010" depends on HAS_IOMEM depends on ARCH_OMAP2PLUS || COMPILE_TEST - depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules + depends on NOP_USB_XCEIV!=m || USB_MUSB_HDRC=m config USB_MUSB_OMAP2PLUS tristate "OMAP2430 and onwards"