From mboxrd@z Thu Jan 1 00:00:00 1970 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=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 B1D1FC2D0DB for ; Fri, 24 Jan 2020 11:19:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79F3C20708 for ; Fri, 24 Jan 2020 11:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864750; bh=opLE3wfI+Lp//yznFkRRvzNM6aKCNoVlcd0Pyau7/rU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lqNIBiFD/8US5Rk6ttO1e4DjTmtdRuI28AUU43XJsy4QTDUMzWbvDcYpT6nfSQuSe wANDOa86DtMz+y4zVQTzDOXGTAyXQNi0v6WG0f1fmi8IOFZsJY2PY5Ct3wiiTF4VPD K+JMEeFoT5BAhez+4Ekt157zCw80aFyXT2w0v2gk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390365AbgAXLTD (ORCPT ); Fri, 24 Jan 2020 06:19:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:56450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390738AbgAXLTC (ORCPT ); Fri, 24 Jan 2020 06:19:02 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 A99B62075D; Fri, 24 Jan 2020 11:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864742; bh=opLE3wfI+Lp//yznFkRRvzNM6aKCNoVlcd0Pyau7/rU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iUr0UebsIgdpMmE7GsG09mzlYkPMIz0vwHHnCryuhxpMyE9WEd0OJiz+VID+QwCio TVoa7K4lqmV/5yJUI9s2XluewYqvsvq++e8VAaynKONoim3o8J+Uc8QQXyDE4j7hOp Nq6JQ4gSWkygSlZiDwXjVX6CmCqgstNQt3B1NZwE= 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.19 340/639] usb: gadget: fsl: fix link error against usb-gadget module Date: Fri, 24 Jan 2020 10:28:30 +0100 Message-Id: <20200124093129.746711294@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 91ea3083e7ad9..affb5393c4c6d 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 -- 2.20.1