diff options
| author | Gao Pan <pandy.gao@nxp.com> | 2017-07-14 17:50:33 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 03a4f33dde2d967cc6b0a42e1722b148bc2f6310 (patch) | |
| tree | 277ab035342772abfac184c825043c4ac410f07a /drivers/mxc/mlb | |
| parent | 8fa627730966e511178b4754b4f014096e523f93 (diff) | |
MLK-15990 imx: mlb: change mlb clock name
change mlb clock name from clk_mlb3p to mlb.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Diffstat (limited to 'drivers/mxc/mlb')
| -rwxr-xr-x | drivers/mxc/mlb/mxc_mlb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mxc/mlb/mxc_mlb.c b/drivers/mxc/mlb/mxc_mlb.c index 287cb6202977..271e3e2557c8 100755 --- a/drivers/mxc/mlb/mxc_mlb.c +++ b/drivers/mxc/mlb/mxc_mlb.c @@ -368,7 +368,7 @@ struct mlb_dev_info { struct mlb_data { struct device *dev; struct mlb_dev_info *devinfo; - struct clk *clk_mlb3p; + struct clk *mlb; struct cdev cdev; struct class *class; /* device class */ dev_t firstdev; @@ -1939,7 +1939,7 @@ static int mxc_mlb150_open(struct inode *inode, struct file *filp) return -EBUSY; } - clk_prepare_enable(drvdata->clk_mlb3p); + clk_prepare_enable(drvdata->mlb); /* initial MLB module */ mlb150_dev_init(); @@ -2029,7 +2029,7 @@ static int mxc_mlb150_release(struct inode *inode, struct file *filp) atomic_set(&pdevinfo->on, 0); - clk_disable_unprepare(drvdata->clk_mlb3p); + clk_disable_unprepare(drvdata->mlb); /* decrease the open count */ atomic_set(&pdevinfo->opencnt, 0); @@ -2664,10 +2664,10 @@ static int mxc_mlb150_probe(struct platform_device *pdev) #endif /* enable clock */ - drvdata->clk_mlb3p = devm_clk_get(&pdev->dev, "mlb"); - if (IS_ERR(drvdata->clk_mlb3p)) { + drvdata->mlb = devm_clk_get(&pdev->dev, "mlb"); + if (IS_ERR(drvdata->mlb)) { dev_err(&pdev->dev, "unable to get mlb clock\n"); - ret = PTR_ERR(drvdata->clk_mlb3p); + ret = PTR_ERR(drvdata->mlb); goto err_dev; } @@ -2700,7 +2700,7 @@ static int mxc_mlb150_remove(struct platform_device *pdev) struct mlb_dev_info *pdevinfo = drvdata->devinfo; if (pdevinfo && atomic_read(&pdevinfo->opencnt)) - clk_disable_unprepare(drvdata->clk_mlb3p); + clk_disable_unprepare(drvdata->mlb); /* disable mlb power */ #ifdef CONFIG_REGULATOR @@ -2730,7 +2730,7 @@ static int mxc_mlb150_suspend(struct platform_device *pdev, pm_message_t state) if (pdevinfo && atomic_read(&pdevinfo->opencnt)) { mlb150_dev_exit(); - clk_disable_unprepare(drvdata->clk_mlb3p); + clk_disable_unprepare(drvdata->mlb); } return 0; @@ -2742,7 +2742,7 @@ static int mxc_mlb150_resume(struct platform_device *pdev) struct mlb_dev_info *pdevinfo = drvdata->devinfo; if (pdevinfo && atomic_read(&pdevinfo->opencnt)) { - clk_prepare_enable(drvdata->clk_mlb3p); + clk_prepare_enable(drvdata->mlb); mlb150_dev_init(); } |