From patchwork Fri Jun 26 21:35:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 32615 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5QLaRaO032450 for ; Fri, 26 Jun 2009 21:36:27 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n5QLaM4u014867 for ; Fri, 26 Jun 2009 16:36:27 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id n5QLaKH3028731 for ; Fri, 26 Jun 2009 16:36:21 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 266BA8066A for ; Fri, 26 Jun 2009 16:36:09 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 7B43A80626 for ; Fri, 26 Jun 2009 16:35:38 -0500 (CDT) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id n5QLZcDU027553 for ; Fri, 26 Jun 2009 16:35:38 -0500 (CDT) Received: from mail198-sin-R.bigfish.com (mail-sin.bigfish.com [207.46.51.104]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id n5QLZWUd006345 for ; Fri, 26 Jun 2009 16:35:37 -0500 Received: from mail198-sin (localhost.localdomain [127.0.0.1]) by mail198-sin-R.bigfish.com (Postfix) with ESMTP id 71FE4810287 for ; Fri, 26 Jun 2009 21:35:31 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh62h) X-Spam-TCS-SCL: 1:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.185; Service: EHS Received: by mail198-sin (MessageSwitch) id 1246052129944632_476; Fri, 26 Jun 2009 21:35:29 +0000 (UCT) Received: from mail-pz0-f185.google.com (mail-pz0-f185.google.com [209.85.222.185]) by mail198-sin.bigfish.com (Postfix) with ESMTP id 95BA2118804C for ; Fri, 26 Jun 2009 21:35:29 +0000 (UTC) Received: by mail-pz0-f185.google.com with SMTP id 15so1863895pzk.4 for ; Fri, 26 Jun 2009 14:35:29 -0700 (PDT) Received: by 10.142.135.16 with SMTP id i16mr170662wfd.3.1246052129314; Fri, 26 Jun 2009 14:35:29 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 30sm4813500wfc.11.2009.06.26.14.35.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 26 Jun 2009 14:35:28 -0700 (PDT) From: Kevin Hilman To: David Brownell Date: Fri, 26 Jun 2009 14:35:23 -0700 Message-Id: <1246052125-18463-2-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.2 In-Reply-To: <1246052125-18463-1-git-send-email-khilman@deeprootsystems.com> References: <1246052125-18463-1-git-send-email-khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 1/3] REMOVE LEGACY CODE: sync drivers/usb/musb w/mainline X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Signed-off-by: Kevin Hilman --- drivers/usb/musb/davinci.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index edc165f..10d11ab 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -35,14 +35,13 @@ #include #include #include -#include #include #include "musb_core.h" #ifdef CONFIG_MACH_DAVINCI_EVM -#define GPIO_nVBUS_DRV 120 +#define GPIO_nVBUS_DRV 87 #endif #include "davinci.h" @@ -418,21 +417,6 @@ int __init musb_platform_init(struct musb *musb) __raw_writel(phy_ctrl, USB_PHY_CTRL); } - /* On dm355, the default-A state machine needs DRVVBUS control. - * If we won't be a host, there's no need to turn it on. - */ - if (cpu_is_davinci_dm355()) { - u32 deepsleep = __raw_readl(DM355_DEEPSLEEP); - - if (is_host_enabled(musb)) { - deepsleep &= ~DRVVBUS_OVERRIDE; - } else { - deepsleep &= ~DRVVBUS_FORCE; - deepsleep |= DRVVBUS_OVERRIDE; - } - __raw_writel(deepsleep, DM355_DEEPSLEEP); - } - /* reset the controller */ musb_writel(tibase, DAVINCI_USB_CTRL_REG, 0x1); @@ -455,15 +439,6 @@ int musb_platform_exit(struct musb *musb) if (is_host_enabled(musb)) del_timer_sync(&otg_workaround); - /* force VBUS off */ - if (cpu_is_davinci_dm355()) { - u32 deepsleep = __raw_readl(DM355_DEEPSLEEP); - - deepsleep &= ~DRVVBUS_FORCE; - deepsleep |= DRVVBUS_OVERRIDE; - __raw_writel(deepsleep, DM355_DEEPSLEEP); - } - davinci_source_power(musb, 0 /*off*/, 1); /* delay, to avoid problems with module reload */