From patchwork Fri Jan 24 09:30:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233184 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 F2656C2D0DB for ; Fri, 24 Jan 2020 09:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4F3F2075D for ; Fri, 24 Jan 2020 09:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859798; bh=yxzE6Q6G1HyDd7Hp/2whV3DEWIk8OkEHIbMZ/0oh4aY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EyLveMvl01p4fb+jKcgbryzjN1Qe7cGX7KbJp1/odhYEd1N7aHIiCYwug7EExF/13 1Wjl7H5Qm+7QRPsMKJdE3mzbDlg+yjRxp+2+/Y/Y0ALGQ7KNX36L/87LUagbnfyYTk EQoS5tAecfunrz7RXHt9CBnHEcTnpfqrofumyQWc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388393AbgAXJ4i (ORCPT ); Fri, 24 Jan 2020 04:56:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:60360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731098AbgAXJ4f (ORCPT ); Fri, 24 Jan 2020 04:56:35 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8B3C121556; Fri, 24 Jan 2020 09:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859795; bh=yxzE6Q6G1HyDd7Hp/2whV3DEWIk8OkEHIbMZ/0oh4aY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e4/VPL/TqCJNzUQVJIzHQIfH4JbiTtk32gHyRlEFv5w2oR36SrwOFMTzur5KLvNgG 0bSCNL2p15YZtV4jm+pxWoL+Dt+RLAJtCdlP0uxKLGT4mXHQNHXZzN05gNkNYtg66G 5sM3fNH7GZNGr2Il/Td6xCDeAtzyb1t3M0Ys9wN4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Felipe Balbi , Sasha Levin Subject: [PATCH 4.14 184/343] usb: gadget: fsl: fix link error against usb-gadget module Date: Fri, 24 Jan 2020 10:30:02 +0100 Message-Id: <20200124092944.229320453@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 2100e3ca3676e894fa48b8f6f01d01733387fe81 ] The dependency to ensure this driver links correctly fails since it can not be a loadable module: drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral': phy-fsl-usb.c:(.text+0x2224): undefined reference to `usb_gadget_vbus_disconnect' Make the option 'tristate' so it can work correctly. Fixes: 5a8d651a2bde ("usb: gadget: move gadget API functions to udc-core") Signed-off-by: Arnd Bergmann Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 85a92d0813dd0..440238061eddf 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM=y && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY