diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/main.c | 15 | ||||
| -rw-r--r-- | drivers/input/evdev.c | 1 | ||||
| -rw-r--r-- | drivers/input/keyreset.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/fsl_tegra_udc.c | 19 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 19 |
5 files changed, 53 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 4a57ecc4ead9..33f9aafb47fb 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -48,6 +48,10 @@ static pm_message_t pm_transition; static void dpm_drv_timeout(unsigned long data); static DEFINE_TIMER(dpm_drv_wd, dpm_drv_timeout, 0, 0); +static struct { + struct device *dev; + struct task_struct *tsk; +} dpm_drv_wd_data; /* * Set once the preparation of devices for a PM transition has started, reset @@ -601,10 +605,15 @@ static bool is_async(struct device *dev) */ static void dpm_drv_timeout(unsigned long data) { - struct device *dev = (struct device *) data; + struct device *dev = dpm_drv_wd_data.dev; + struct task_struct *tsk = dpm_drv_wd_data.tsk; printk(KERN_EMERG "**** DPM device timeout: %s (%s)\n", dev_name(dev), (dev->driver ? dev->driver->name : "no driver")); + + printk(KERN_EMERG "dpm suspend stack:\n"); + show_stack(tsk, NULL); + BUG(); } @@ -615,7 +624,9 @@ static void dpm_drv_timeout(unsigned long data) */ static void dpm_drv_wdset(struct device *dev) { - dpm_drv_wd.data = (unsigned long) dev; + dpm_drv_wd_data.dev = dev; + dpm_drv_wd_data.tsk = get_current(); + dpm_drv_wd.data = (unsigned long) &dpm_drv_wd_data; mod_timer(&dpm_drv_wd, jiffies + (HZ * 3)); } diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 7d22f51392dd..43e94e5188dd 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -316,6 +316,7 @@ static int evdev_open(struct inode *inode, struct file *file) err_free_client: evdev_detach_client(evdev, client); + wake_lock_destroy(&client->wake_lock); kfree(client); err_put_evdev: put_device(&evdev->dev); diff --git a/drivers/input/keyreset.c b/drivers/input/keyreset.c index a5091ac19bbe..36208fe0baae 100644 --- a/drivers/input/keyreset.c +++ b/drivers/input/keyreset.c @@ -88,10 +88,10 @@ static void keyreset_event(struct input_handle *handle, unsigned int type, state->restart_disabled = 1; if (restart_requested) panic("keyboard reset failed, %d", restart_requested); - pr_info("keyboard reset\n"); if (state->reset_fn) { restart_requested = state->reset_fn(); } else { + pr_info("keyboard reset\n"); schedule_work(&restart_work); restart_requested = 1; } diff --git a/drivers/usb/gadget/fsl_tegra_udc.c b/drivers/usb/gadget/fsl_tegra_udc.c index 6091d1f7ea0c..74c1d0b52541 100644 --- a/drivers/usb/gadget/fsl_tegra_udc.c +++ b/drivers/usb/gadget/fsl_tegra_udc.c @@ -15,6 +15,7 @@ static struct tegra_usb_phy *phy; static struct clk *udc_clk; +static struct clk *emc_clk; static void *udc_base; int fsl_udc_clk_init(struct platform_device *pdev) @@ -33,6 +34,16 @@ int fsl_udc_clk_init(struct platform_device *pdev) clk_enable(udc_clk); + emc_clk = clk_get(&pdev->dev, "emc"); + if (IS_ERR(emc_clk)) { + dev_err(&pdev->dev, "Can't get emc clock\n"); + err = PTR_ERR(emc_clk); + goto err_emc; + } + + clk_enable(emc_clk); + clk_set_rate(emc_clk, 240000000); + /* we have to remap the registers ourselves as fsl_udc does not * export them for us. */ @@ -65,6 +76,9 @@ int fsl_udc_clk_init(struct platform_device *pdev) err1: iounmap(udc_base); err0: + clk_disable(emc_clk); + clk_put(emc_clk); +err_emc: clk_disable(udc_clk); clk_put(udc_clk); return err; @@ -82,16 +96,21 @@ void fsl_udc_clk_release(void) clk_disable(udc_clk); clk_put(udc_clk); + + clk_disable(emc_clk); + clk_put(emc_clk); } void fsl_udc_clk_suspend(void) { tegra_usb_phy_power_off(phy); clk_disable(udc_clk); + clk_disable(emc_clk); } void fsl_udc_clk_resume(void) { + clk_enable(emc_clk); clk_enable(udc_clk); tegra_usb_phy_power_on(phy); } diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 597c0a2a911e..5e14bfbe148c 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -50,6 +50,7 @@ struct tegra_ehci_hcd { struct ehci_hcd *ehci; struct tegra_usb_phy *phy; struct clk *clk; + struct clk *emc_clk; struct otg_transceiver *transceiver; int host_resumed; int bus_suspended; @@ -62,6 +63,7 @@ static void tegra_ehci_power_up(struct usb_hcd *hcd) { struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller); + clk_enable(tegra->emc_clk); clk_enable(tegra->clk); tegra_usb_phy_power_on(tegra->phy); tegra->host_resumed = 1; @@ -74,6 +76,7 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd) tegra->host_resumed = 0; tegra_usb_phy_power_off(tegra->phy); clk_disable(tegra->clk); + clk_disable(tegra->emc_clk); } static int tegra_ehci_hub_control( @@ -634,6 +637,16 @@ static int tegra_ehci_probe(struct platform_device *pdev) if (err) goto fail_clken; + tegra->emc_clk = clk_get(&pdev->dev, "emc"); + if (IS_ERR(tegra->emc_clk)) { + dev_err(&pdev->dev, "Can't get emc clock\n"); + err = PTR_ERR(tegra->emc_clk); + goto fail_emc_clk; + } + + clk_enable(tegra->emc_clk); + clk_set_rate(tegra->emc_clk, 240000000); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "Failed to get I/O memory\n"); @@ -708,6 +721,9 @@ fail: fail_phy: iounmap(hcd->regs); fail_io: + clk_disable(tegra->emc_clk); + clk_put(tegra->emc_clk); +fail_emc_clk: clk_disable(tegra->clk); fail_clken: clk_put(tegra->clk); @@ -772,6 +788,9 @@ static int tegra_ehci_remove(struct platform_device *pdev) clk_disable(tegra->clk); clk_put(tegra->clk); + clk_disable(tegra->emc_clk); + clk_put(tegra->emc_clk); + kfree(tegra); return 0; } |