From patchwork Tue Nov 17 15:09:50 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ajay Kumar Gupta <ajay.gupta@ti.com>
X-Patchwork-Id: 60676
Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHFDLIh023733
	for <patchwork-davinci@patchwork.kernel.org>;
	Tue, 17 Nov 2009 15:13:22 GMT
Received: from dlep36.itg.ti.com ([157.170.170.91])
	by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAHFBGFM005276
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 17 Nov 2009 09:11:17 -0600
Received: from linux.omap.com (localhost [127.0.0.1])
	by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id nAHFBGN3020280;
	Tue, 17 Nov 2009 09:11:16 -0600 (CST)
Received: from linux.omap.com (localhost [127.0.0.1])
	by linux.omap.com (Postfix) with ESMTP
	id 40B958062A; Tue, 17 Nov 2009 09:10:50 -0600 (CST)
X-Original-To: davinci-linux-open-source@linux.davincidsp.com
Delivered-To: davinci-linux-open-source@linux.davincidsp.com
Received: from dbdp31.itg.ti.com (dbdp31.itg.ti.com [172.24.170.98])
	by linux.omap.com (Postfix) with ESMTP id 217088062F
	for <davinci-linux-open-source@linux.davincidsp.com>;
	Tue, 17 Nov 2009 09:10:04 -0600 (CST)
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 nAHF9wTR027837;
	Tue, 17 Nov 2009 20:39:59 +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
	nAHF9wW0024380; Tue, 17 Nov 2009 20:39:58 +0530
Received: (from a0393629@localhost)
	by psplinux050.india.ti.com (8.13.1/8.13.1/Submit) id nAHF9wbV024377;
	Tue, 17 Nov 2009 20:39:58 +0530
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
To: linux-usb@vger.kernel.org
Subject: [PATCH 2/8] musb: Get power (mA) from board data
Date: Tue, 17 Nov 2009 20:39:50 +0530
Message-Id: <1258470596-24321-3-git-send-email-ajay.gupta@ti.com>
X-Mailer: git-send-email 1.6.2.4
In-Reply-To: <1258470596-24321-2-git-send-email-ajay.gupta@ti.com>
References: <1258470596-24321-1-git-send-email-ajay.gupta@ti.com>
	<1258470596-24321-2-git-send-email-ajay.gupta@ti.com>
Cc: davinci-linux-open-source@linux.davincidsp.com, cooloney@kernel.org,
	felipe.balbi@nokia.com, linux-omap@vger.kernel.org, gadiyar@ti.com
X-BeenThere: davinci-linux-open-source@linux.davincidsp.com
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: <davinci-linux-open-source.linux.davincidsp.com>
List-Unsubscribe: 
 <http://linux.davincidsp.com/mailman/options/davinci-linux-open-source>,
	<mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=unsubscribe>
List-Archive: 
 <http://linux.davincidsp.com/pipermail/davinci-linux-open-source>
List-Post: <mailto:davinci-linux-open-source@linux.davincidsp.com>
List-Help: 
 <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=help>
List-Subscribe: 
 <http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source>,
	<mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=subscribe>
MIME-Version: 1.0
Sender: davinci-linux-open-source-bounces@linux.davincidsp.com
Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com


diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3a61ddb..818ccda 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2033,7 +2033,9 @@ bad_config:
 		if (is_otg_enabled(musb))
 			hcd->self.otg_port = 1;
 		musb->xceiv->host = &hcd->self;
-		hcd->power_budget = 2 * (plat->power ? : 250);
+		if (plat->board_data)
+			hcd->power_budget =
+				2 * (plat->board_data->power ? : 250);
 	}
 
 	/* For the host-only role, we can activate right away.