summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Yu <davyu@nvidia.com>2014-01-16 21:18:58 +0900
committerHarry Hong <hhong@nvidia.com>2014-01-16 17:03:52 -0800
commit3e0bcfb0d3c67d83cbd1b4787d54266005175f08 (patch)
treef58602e57cf3d5cd30b93f1a7b215d798b94986b /drivers
parent06f61673d3b42850f9a077e6c7bdf17c72d7f66f (diff)
usb: gadget: Tegra: don't boost cpu freq on boot
Change-Id: I375e92e55b6f37e29e384f979f09158eadf7269f Signed-off-by: David Yu <davyu@nvidia.com> Reviewed-on: http://git-master/r/356537 Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/tegra_udc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c
index 399053adb333..6bcf279f9855 100644
--- a/drivers/usb/gadget/tegra_udc.c
+++ b/drivers/usb/gadget/tegra_udc.c
@@ -1502,7 +1502,9 @@ static int tegra_vbus_session(struct usb_gadget *gadget, int is_active)
if (udc->vbus_active && !is_active) {
#ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ
- queue_work(udc->boost_cpufreq_wq, &udc->boost_cpufreq_work);
+ if (system_state != SYSTEM_BOOTING)
+ queue_work(udc->boost_cpufreq_wq,
+ &udc->boost_cpufreq_work);
#endif
/* If cable disconnected, cancel any delayed work */
cancel_delayed_work_sync(&udc->non_std_charger_work);
@@ -1520,7 +1522,9 @@ static int tegra_vbus_session(struct usb_gadget *gadget, int is_active)
tegra_usb_set_charging_current(udc);
} else if (!udc->vbus_active && is_active) {
#ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ
- queue_work(udc->boost_cpufreq_wq, &udc->boost_cpufreq_work);
+ if (system_state != SYSTEM_BOOTING)
+ queue_work(udc->boost_cpufreq_wq,
+ &udc->boost_cpufreq_work);
#endif
tegra_usb_phy_power_on(udc->phy);
/* setup the controller in the device mode */