Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can:ti_hecc: Add pm hook-up

Browse Source 
Added the suspend and resume implementation in the HECC (CAN)
driver.

Signed-off-by: K R Baalaaji <krbaalaaji@ti.com>
Signed-off-by: Sriramakrishnan <srk@ti.com>
Acked-by: Anant Gole <anantgole@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sriram 2010-02-22 03:35:36 +00:00 committed by David S. Miller
parent e5f8d9ac46
commit 35e2da46d2
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/net/can/ti_hecc.c
View File

@ -826,7 +826,6 @@ static int ti_hecc_open(struct net_device *ndev)
return err; return err;
} }
clk_enable(priv->clk);
ti_hecc_start(ndev); ti_hecc_start(ndev);
napi_enable(&priv->napi); napi_enable(&priv->napi);
netif_start_queue(ndev); netif_start_queue(ndev);
@ -842,7 +841,6 @@ static int ti_hecc_close(struct net_device *ndev)
napi_disable(&priv->napi); napi_disable(&priv->napi);
ti_hecc_stop(ndev); ti_hecc_stop(ndev);
free_irq(ndev->irq, ndev); free_irq(ndev->irq, ndev);
clk_disable(priv->clk);
close_candev(ndev); close_candev(ndev);
return 0; return 0;
@ -928,6 +926,7 @@ static int ti_hecc_probe(struct platform_device *pdev)
netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll, netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll,
HECC_DEF_NAPI_WEIGHT); HECC_DEF_NAPI_WEIGHT);
clk_enable(priv->clk);
err = register_candev(ndev); err = register_candev(ndev);
if (err) { if (err) {
dev_err(&pdev->dev, "register_candev() failed\n"); dev_err(&pdev->dev, "register_candev() failed\n");
@ -956,6 +955,7 @@ static int __devexit ti_hecc_remove(struct platform_device *pdev)
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct ti_hecc_priv *priv = netdev_priv(ndev); struct ti_hecc_priv *priv = netdev_priv(ndev);
clk_disable(priv->clk);
clk_put(priv->clk); clk_put(priv->clk);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap(priv->base); iounmap(priv->base);
@ -967,6 +967,48 @@ static int __devexit ti_hecc_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state)
{
struct net_device *dev = platform_get_drvdata(pdev);
struct ti_hecc_priv *priv = netdev_priv(dev);
if (netif_running(dev)) {
netif_stop_queue(dev);
netif_device_detach(dev);
}
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
priv->can.state = CAN_STATE_SLEEPING;
clk_disable(priv->clk);
return 0;
}
static int ti_hecc_resume(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
struct ti_hecc_priv *priv = netdev_priv(dev);
clk_enable(priv->clk);
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
priv->can.state = CAN_STATE_ERROR_ACTIVE;
if (netif_running(dev)) {
netif_device_attach(dev);
netif_start_queue(dev);
}
return 0;
}
#else
#define ti_hecc_suspend NULL
#define ti_hecc_resume NULL
#endif
/* TI HECC netdevice driver: platform driver structure */ /* TI HECC netdevice driver: platform driver structure */
static struct platform_driver ti_hecc_driver = { static struct platform_driver ti_hecc_driver = {
.driver = { .driver = {
@ -975,6 +1017,8 @@ static struct platform_driver ti_hecc_driver = {
}, },
.probe = ti_hecc_probe, .probe = ti_hecc_probe,
.remove = __devexit_p(ti_hecc_remove), .remove = __devexit_p(ti_hecc_remove),
.suspend = ti_hecc_suspend,
.resume = ti_hecc_resume,
}; };
static int __init ti_hecc_init_driver(void) static int __init ti_hecc_init_driver(void)
@ -982,14 +1026,15 @@ static int __init ti_hecc_init_driver(void)
printk(KERN_INFO DRV_DESC "\n"); printk(KERN_INFO DRV_DESC "\n");
return platform_driver_register(&ti_hecc_driver); return platform_driver_register(&ti_hecc_driver);
} }
module_init(ti_hecc_init_driver);
static void __exit ti_hecc_exit_driver(void) static void __exit ti_hecc_exit_driver(void)
{ {
printk(KERN_INFO DRV_DESC " unloaded\n"); printk(KERN_INFO DRV_DESC " unloaded\n");
platform_driver_unregister(&ti_hecc_driver); platform_driver_unregister(&ti_hecc_driver);
} }
module_exit(ti_hecc_exit_driver); module_exit(ti_hecc_exit_driver);
module_init(ti_hecc_init_driver);
MODULE_AUTHOR("Anant Gole <anantgole@ti.com>"); MODULE_AUTHOR("Anant Gole <anantgole@ti.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");