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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 E0C8EC33CB6 for ; Thu, 16 Jan 2020 17:38:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0A19246DD for ; Thu, 16 Jan 2020 17:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196323; bh=PJ5Bj2VzJGTSkSgGf5mZ1YqAaU1hgtNSu8ZJDBQfYk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qT7K4GZ1XdDXwzyTq2ausPCpWSg8CujlkefA0Do8q93lW+T6A9q7kcW9AOh0di6XL VQ/xZmoEU2tRyMVoV3WXfXmPiR+Z5kCPThsJ0FB0CIH2xNJdigKniQVc6GJx2CHz1M kS9ke4HkRk1l+TOSxHnM+KP2xTduzBfBNHpWzMAw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393366AbgAPRim (ORCPT ); Thu, 16 Jan 2020 12:38:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:54622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393167AbgAPRim (ORCPT ); Thu, 16 Jan 2020 12:38:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E08F1246E7; Thu, 16 Jan 2020 17:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196321; bh=PJ5Bj2VzJGTSkSgGf5mZ1YqAaU1hgtNSu8ZJDBQfYk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b73ijIjVR7cToytx4fWZD1RXfh7hhne36zDMVJ+6Dt/AbxnugE/IM2zEIBmZioCa2 nfZIV7g7tI5wCBICtLCvUeTKNamTencSjMWrEeaIBEODmH8HSHA9OWgQE0cEL4ACWM ixBFVeu1JpwJ994miq04dEdsB+E3LQp+y7GVRQHQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 125/251] usb: gadget: fsl: fix link error against usb-gadget module Date: Thu, 16 Jan 2020 12:34:34 -0500 Message-Id: <20200116173641.22137-85-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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 19ce615455c1..de70e70d02be 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -19,7 +19,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