From patchwork Fri Feb 27 20:12:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5903191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 31B9FBF440 for ; Fri, 27 Feb 2015 20:13:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E1DD20253 for ; Fri, 27 Feb 2015 20:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7BF120107 for ; Fri, 27 Feb 2015 20:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754843AbbB0UMy (ORCPT ); Fri, 27 Feb 2015 15:12:54 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:58285 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752848AbbB0UMy (ORCPT ); Fri, 27 Feb 2015 15:12:54 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MRfyq-1Y3CJb0P8K-00Sj1F; Fri, 27 Feb 2015 21:12:47 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Tony Lindgren , Aaro Koskinen , ivo.g.dimitrov.75@gmail.com, khilman@kernel.org, sre@debian.org, kernel list , sre@ring0.de, Sakari Ailus , Pavel Machek , pali.rohar@gmail.com, linux-omap@vger.kernel.org, patrikbachan@gmail.com Subject: [PATCH] usb: musb: fix Kconfig regression Date: Fri, 27 Feb 2015 21:12:45 +0100 Message-ID: <7445620.7S2XydQea5@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20150227153809.GS11056@atomide.com> References: <20150217185518.GA3825@amd> <20150226230307.GA27809@fuloong-minipc.musicnaut.iki.fi> <20150227153809.GS11056@atomide.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:ylCbuBqm/jDJqMFE09RsO0CBKUurVOcnaCSE373AnOXcby2puiS YMDb/k4PYbWMINtUIDeN9vXM+8A5VUNjWXUuj5jcY09hRVaC87Ba9DqPtSSOarDKjSbpCQJ Kerhf7cFZCfKlXZCFer0azY/hjVb3Kk+93eJKncIsHGKjTmxh6ZXt8zWh7yH+jFc/Qfdbmh IzDsIkzUmQW++bRiecRUw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A recent bug fix I did that was marked for stable backports introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY. I was missing the fact that the PHY driver already stubs out the omap_control_usb_set_mode, and we only need to add a dependency to prevent the musb-omap2430 driver from being built-in when the phy driver is a loadable module, but we should not prevent it from being built altogether when the phy driver is disabled. This changes the dependency to allow OMAP_CONTROL_PHY to be disabled, but to disallow USB_MUSB_OMAP2PLUS from being built-in if OMAP_CONTROL_PHY is a loadable module. Signed-off-by: Arnd Bergmann Fixes: ca784be36cc725 ("usb: start using the control module driver") Cc: # v3.9+ Cc: Felipe Balbi Acked-by: Pavel Machek --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 14e1628483d9..39db8b603627 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010 config USB_MUSB_OMAP2PLUS tristate "OMAP2430 and onwards" - depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY + depends on ARCH_OMAP2PLUS && USB + depends on OMAP_CONTROL_PHY || !OMAP_CONTROL_PHY select GENERIC_PHY config USB_MUSB_AM35X