diff options
| author | Fernando Guzman Lugo <fernando.lugo@ti.com> | 2012-06-15 13:12:04 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-09-07 13:06:23 +0800 |
| commit | c46de8591e2769037fdab8443316e487e72cac65 (patch) | |
| tree | 2aef5487c4a0dcf85982b6360e273d6cefdd4739 /drivers | |
| parent | 97fd276703e3bbf31999e2c685a439a7aa3dae3d (diff) | |
rpmsg: resmgr: omap: retrieve ISS opt clk handle from platform data
The OMAP rpmsg driver is currently getting the struct clk handle for
the ISS optional clock through the omap_get_clk_by_name function. This
function is currently not exported, and causes a build error if
omap_rpmsg_resmgr were to be built as a module. This function call is
moved to the mach-omap2/rpmsg_resmgr.c which is always built-in, and
the ISS optional clock struct clk is published to the generic rpmsg
omap resmgr layer through platform data to its omap driver.
Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rpmsg/omap_rpmsg_resmgr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/rpmsg/omap_rpmsg_resmgr.c b/drivers/rpmsg/omap_rpmsg_resmgr.c index a0e712430db4..d333f5364c82 100644 --- a/drivers/rpmsg/omap_rpmsg_resmgr.c +++ b/drivers/rpmsg/omap_rpmsg_resmgr.c @@ -27,7 +27,6 @@ #include <plat/dma.h> #include <plat/dmtimer.h> #include <plat/omap-pm.h> -#include <plat/clock.h> #include <plat/rpmsg_resmgr.h> #include "omap_rpmsg_resmgr.h" @@ -761,15 +760,8 @@ static int omap_rprm_probe(struct platform_device *pdev) { struct omap_rprm_pdata *pdata = pdev->dev.platform_data; - /* get iss optional clock if any */ - if (pdata->iss_opt_clk_name) { - iss_opt_clk = omap_clk_get_by_name(pdata->iss_opt_clk_name); - if (!iss_opt_clk) { - dev_err(&pdev->dev, "error getting iss opt clk\n"); - return -ENOENT; - } - } - + /* set iss optional clock */ + iss_opt_clk = pdata->iss_opt_clk; mach_ops = pdata->ops; return 0; |