From patchwork Mon Oct 8 13:17:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Constantine Shulyupin X-Patchwork-Id: 1565811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A5B3940135 for ; Mon, 8 Oct 2012 13:19:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLDD7-0002TU-6d; Mon, 08 Oct 2012 13:17:29 +0000 Received: from [2605:dc00:100:2::a4] (helo=oproxy12-pub.bluehost.com) by merlin.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLDD0-0002Ps-JH for linux-arm-kernel@lists.infradead.org; Mon, 08 Oct 2012 13:17:23 +0000 Received: (qmail 14881 invoked by uid 0); 8 Oct 2012 13:17:18 -0000 Received: from unknown (HELO box668.bluehost.com) (66.147.244.168) by oproxy12.bluehost.com with SMTP; 8 Oct 2012 13:17:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=makelinux.com; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=nOWSyFdqcEvVj7d3hj2EBEW4IJKzttJh3QJDksIIb3w=; b=F83GR8nEbUrHdPgRSBalXiJlZHo4uBgICKMUNnKbfFaoNB2NB9R85O6eAhAHJHzg6OCd7QyniZV5BQqeHwiRlbddGne8oB8Hcduf95q/tPg52w5+z7Xjv+kdMm/q1pT5; Received: from [77.127.126.110] (port=38016 helo=makelinux.home) by box668.bluehost.com with esmtpa (Exim 4.76) (envelope-from ) id 1TLDCv-0005kI-KP; Mon, 08 Oct 2012 07:17:18 -0600 From: Constantine Shulyupin To: nsekhar@ti.com, gregkh@linuxfoundation.org Subject: [PATCH] usb: remove CONFIG_USB_MUSB_HOST etc Date: Mon, 8 Oct 2012 15:17:07 +0200 Message-Id: <1349702227-24875-1-git-send-email-const@MakeLinux.com> X-Mailer: git-send-email 1.7.9.5 X-Identified-User: {1470:box668.bluehost.com:makelinu:makelinux.net} {sentby:smtp auth 77.127.126.110 authed with poster@makelinux.net} X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: davinci-linux-open-source@linux.davincidsp.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, Constantine Shulyupin , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Constantine Shulyupin Remove USB configuration in arch/arm/mach-davinci/usb.c accordingly CONFIG_USB_MUSB_OTG CONFIG_USB_MUSB_PERIPHERAL CONFIG_USB_MUSB_HOST and set MUSB_OTG configuration by default because this configuration options are removed from Kconfig. Signed-off-by: Constantine Shulyupin Acked-by: Manjunathappa, Prakash Acked-by: Heiko Schocher Acked-by: Felipe Balbi --- arch/arm/mach-davinci/usb.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index f77b953..34509ff 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data usb_data = { -#if defined(CONFIG_USB_MUSB_OTG) /* OTG requires a Mini-AB connector */ .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#elif defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#endif .clock = "usb", .config = &musb_config, };