Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp504462rwb; Thu, 18 Aug 2022 07:31:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR757LgZSIEp1Af71ILu9tN51jHIe0jIrqjhawWtayCmrK8ouxGeGHem1p5SW9pQyXpcDbrI X-Received: by 2002:a05:6402:5ca:b0:445:c80a:3c2 with SMTP id n10-20020a05640205ca00b00445c80a03c2mr2483376edx.247.1660833089646; Thu, 18 Aug 2022 07:31:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660833089; cv=none; d=google.com; s=arc-20160816; b=nOZf1uE7GrGfLnQdJXMTgZ+LcDAdS8CgcSCDZUMtv3oYH2Clt6Z32drTONjCoya64A AHawOanGjBv+3hM2R4KVWtoh2FJ3QDC+o6tBIBN+WZujiFUyLgQRc0rjHgq1l5RlC2sJ cNsUbyJA6W2RZdM0LxJHM4t08lqaa24tJv5T4eRL8+JO5Uz3gGJCfDYXzSJI04EfClhK fP6xCsejjf7KLZvAuLCjjVI18ICzQyz62nk+Lw83mJ4ccE1FgV2t2dEpv7et4P1MKb97 CPu80QTXy0paQ1X5mWvSTZnGuizu7WoT4Ck3CE70kEQGrDmNALdS2xynBLs7nNN33QOe K3Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zO9GR5zMqxo5w4Lr/bVnz+EXOlSqreckJsOCUT06kVA=; b=jSXHCf3+47SuF/jKD03No5i5BA+Ig+77vdKHMEeocwTxv1MOZzbvGYMhiZ/MXdptIp J05acjNAZek3ekgXKkZN1jkMu6Kugo48ZZDpAQckIdHpkGx29UQBs7ZuPsvDn4czdDgc KcqKpRVG472KP5OEq+RgIXocCCJBKsPlAI1bHlRr478yYEhXwmP6gwgNkP2rP0wNNUnl goMnSX62SCyZOLzC38dO3i4k9SvNKEx3VN2+XJqVt7az3pGKv5AMGcNLg7M0ontld5+h ko4JYimRJUekl0Em+58LhQJvy+uJSobZGp8tm7RE2Qf6BFbhC2y8lJU9NiXFsQac8vfK 5nTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RVXozCtz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qb30-20020a1709077e9e00b007397aa27b32si1255833ejc.891.2022.08.18.07.31.03; Thu, 18 Aug 2022 07:31:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RVXozCtz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245479AbiHROBI (ORCPT + 99 others); Thu, 18 Aug 2022 10:01:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245618AbiHROAK (ORCPT ); Thu, 18 Aug 2022 10:00:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA7356D540; Thu, 18 Aug 2022 07:00:01 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 64C62B82197; Thu, 18 Aug 2022 14:00:00 +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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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" -- 2.29.2