From patchwork Mon Dec 19 07:52:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Langlais X-Patchwork-Id: 5863 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6881D23E2D for ; Mon, 19 Dec 2011 07:54:38 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4FE9EA1801F for ; Mon, 19 Dec 2011 07:54:38 +0000 (UTC) Received: by eaac11 with SMTP id c11so1593043eaa.11 for ; Sun, 18 Dec 2011 23:54:38 -0800 (PST) Received: by 10.204.154.7 with SMTP id m7mr1054725bkw.71.1324281278043; Sun, 18 Dec 2011 23:54:38 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs207bkc; Sun, 18 Dec 2011 23:54:37 -0800 (PST) Received: by 10.213.9.81 with SMTP id k17mr4845697ebk.36.1324281275965; Sun, 18 Dec 2011 23:54:35 -0800 (PST) Received: from eu1sys200aog113.obsmtp.com (eu1sys200aog113.obsmtp.com. [207.126.144.135]) by mx.google.com with SMTP id y8si4790311eeb.168.2011.12.18.23.54.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Dec 2011 23:54:35 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of philippe.langlais@stericsson.com) client-ip=207.126.144.135; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of philippe.langlais@stericsson.com) smtp.mail=philippe.langlais@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKTu7ttS0vO9bYvdISelHQnz+dp/G8PiIX@postini.com; Mon, 19 Dec 2011 07:54:35 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id E02E53A; Mon, 19 Dec 2011 07:54:22 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id F01FB4A; Mon, 19 Dec 2011 07:22:46 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 696FC24C2F0; Mon, 19 Dec 2011 08:54:22 +0100 (CET) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 19 Dec 2011 08:54:26 +0100 From: Philippe Langlais To: , , Cc: , , Philippe Langlais Subject: [PATCH] mach-ux500: musb: Now musb is always in OTG mode Date: Mon, 19 Dec 2011 08:52:43 +0100 Message-ID: <1324281163-29632-1-git-send-email-philippe.langlais@stericsson.com> X-Mailer: git-send-email 1.7.6 MIME-Version: 1.0 From: Philippe Langlais This change is needed after 622859634 "usb: musb: drop a gigantic amount of ifdeferry", where CONFIG_USB_MUSB_PERIPHERAL & CONFIG_USB_MUSB_HOST has been removed. Signed-off-by: Philippe Langlais --- arch/arm/mach-ux500/usb.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index 0a01cbd..9f9e1c2 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -95,13 +95,7 @@ static struct musb_hdrc_config musb_hdrc_config = { }; static struct musb_hdrc_platform_data musb_platform_data = { -#if defined(CONFIG_USB_MUSB_OTG) .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#else /* defined(CONFIG_USB_MUSB_HOST) */ - .mode = MUSB_HOST, -#endif .config = &musb_hdrc_config, .board_data = &musb_board_data, };