From patchwork Sun Nov 15 08:59:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar Gupta X-Patchwork-Id: 60088 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAF8xvrf003144 for ; Sun, 15 Nov 2009 08:59:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752339AbZKOI7s (ORCPT ); Sun, 15 Nov 2009 03:59:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752413AbZKOI7s (ORCPT ); Sun, 15 Nov 2009 03:59:48 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:34336 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752323AbZKOI7o (ORCPT ); Sun, 15 Nov 2009 03:59:44 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAF8xiAb017022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 15 Nov 2009 02:59:47 -0600 Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id nAF8xdgv029447; Sun, 15 Nov 2009 14:29:39 +0530 (IST) Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by psplinux050.india.ti.com (8.13.1/8.13.1) with ESMTP id nAF8xdoB001850; Sun, 15 Nov 2009 14:29:39 +0530 Received: (from a0393629@localhost) by psplinux050.india.ti.com (8.13.1/8.13.1/Submit) id nAF8xdXA001847; Sun, 15 Nov 2009 14:29:39 +0530 From: Ajay Kumar Gupta To: linux-omap@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com Cc: felipe.balbi@nokia.com, khilman@deeprootsystems.com, Ajay Kumar Gupta Subject: [PATCH 5/7] musb: Add 'extvbus' in musb_hdrc_board_data Date: Sun, 15 Nov 2009 14:29:36 +0530 Message-Id: <1258275578-1773-6-git-send-email-ajay.gupta@ti.com> X-Mailer: git-send-email 1.6.2.4 In-Reply-To: <1258275578-1773-5-git-send-email-ajay.gupta@ti.com> References: <1258275578-1773-1-git-send-email-ajay.gupta@ti.com> <1258275578-1773-2-git-send-email-ajay.gupta@ti.com> <1258275578-1773-3-git-send-email-ajay.gupta@ti.com> <1258275578-1773-4-git-send-email-ajay.gupta@ti.com> <1258275578-1773-5-git-send-email-ajay.gupta@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 818ccda..c0a6760 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2027,15 +2027,25 @@ bad_config: /* host side needs more setup */ if (is_host_enabled(musb)) { struct usb_hcd *hcd = musb_to_hcd(musb); + u8 busctl; otg_set_host(musb->xceiv, &hcd->self); if (is_otg_enabled(musb)) hcd->self.otg_port = 1; musb->xceiv->host = &hcd->self; - if (plat->board_data) + if (plat->board_data) { hcd->power_budget = 2 * (plat->board_data->power ? : 250); + /* program PHY to use external vBus if required */ + if (plat->board_data->extvbus) { + busctl = musb_readb(musb->mregs, + MUSB_ULPI_BUSCONTROL); + busctl |= ULPI_USE_EXTVBUS; + musb_writeb(musb->mregs, + MUSB_ULPI_BUSCONTROL, busctl); + } + } } /* For the host-only role, we can activate right away. diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h index cc1d71b..a0314df 100644 --- a/drivers/usb/musb/musb_regs.h +++ b/drivers/usb/musb/musb_regs.h @@ -72,6 +72,10 @@ #define MUSB_DEVCTL_HR 0x02 #define MUSB_DEVCTL_SESSION 0x01 +/* ULPI VBUSCONTROL */ +#define ULPI_USE_EXTVBUS 0x01 +#define ULPI_USE_EXTVBUSIND 0x02 + /* TESTMODE */ #define MUSB_TEST_FORCE_HOST 0x80 #define MUSB_TEST_FIFO_ACCESS 0x40 @@ -246,6 +250,7 @@ /* REVISIT: vctrl/vstatus: optional vendor utmi+phy register at 0x68 */ #define MUSB_HWVERS 0x6C /* 8 bit */ +#define MUSB_ULPI_BUSCONTROL 0x70 /* 8 bit */ #define MUSB_EPINFO 0x78 /* 8 bit */ #define MUSB_RAMINFO 0x79 /* 8 bit */ diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index 6e1426c..604c404 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -33,7 +33,8 @@ struct musb_hdrc_board_data { u8 power; /* (HOST or OTG) msec/2 after VBUS on till power good */ u8 potpgt; - + /* flag to program PHY to use external Vbus */ + u8 extvbus; }; struct musb_hdrc_config {